Merge branch 'master' into lets_move

This commit is contained in:
KimLS
2016-01-15 14:32:27 -08:00
9 changed files with 166 additions and 69 deletions
+4 -8
View File
@@ -4253,15 +4253,11 @@ void Client::Handle_OP_ClickObjectAction(const EQApplicationPacket *app)
EQApplicationPacket end_trade2(OP_FinishWindow2, 0);
QueuePacket(&end_trade2);
return;
// RoF sends a 0 sized packet for closing objects
/*
Object* object = GetTradeskillObject();
if (object) {
object->CastToObject()->Close();
}
*/
if (GetTradeskillObject() && GetClientVersion() >= ClientVersion::RoF)
GetTradeskillObject()->CastToObject()->Close();
return;
}
else
{