NPE fix Ticket 2166

L2_GameServer_T1/java/net/sf/l2j/gameserver/clientpackets/AnswerTradeRequest.java

@@ -55,7 +55,7 @@ public final class AnswerTradeRequest extends L2GameClientPacket
 
 
         L2PcInstance partner = player.getActiveRequester();
-        if (partner == null || L2World.getInstance().findObject(partner.getObjectId()) == null)
+        if (partner == null)
         {
             // Trade partner not found, cancel trade
 			player.sendPacket(new TradeDone(0));
@@ -65,6 +65,16 @@ public final class AnswerTradeRequest extends L2GameClientPacket
 			msg = null;
             return;
         }
+        else if (L2World.getInstance().findObject(partner.getObjectId()) == null)
+        {
+        	// Trade partner not found, cancel trade
+			player.sendPacket(new TradeDone(0));
+            SystemMessage msg = new SystemMessage(SystemMessageId.TARGET_IS_NOT_FOUND_IN_THE_GAME);
+            player.sendPacket(msg);
+			player.setActiveRequester(null);
+			msg = null;
+            return;
+        }
 
 		if (_response == 1) player.startTrade(partner);
 		else