Gnacik: replace findObject with getPlayer.

L2_GameServer/java/com/l2jserver/gameserver/instancemanager/CoupleManager.java

@@ -135,8 +135,8 @@ public class CoupleManager
 		Couple couple = getCouples().get(index);
 		if (couple != null)
 		{
-			L2PcInstance player1 = (L2PcInstance) L2World.getInstance().findObject(couple.getPlayer1Id());
-			L2PcInstance player2 = (L2PcInstance) L2World.getInstance().findObject(couple.getPlayer2Id());
+			L2PcInstance player1 = L2World.getInstance().getPlayer(couple.getPlayer1Id());
+			L2PcInstance player2 = L2World.getInstance().getPlayer(couple.getPlayer2Id());
 			if (player1 != null)
 			{
 				player1.setPartnerId(0);

L2_GameServer/java/com/l2jserver/gameserver/model/TradeList.java

@@ -563,7 +563,7 @@ public class TradeList
 	private boolean validate()
 	{
 		// Check for Owner validity
-		if (_owner == null || L2World.getInstance().findObject(_owner.getObjectId()) == null)
+		if (_owner == null || L2World.getInstance().getPlayer(_owner.getObjectId()) == null)
 		{
 			_log.warning("Invalid owner of TradeList");
 			return false;

L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -5386,7 +5386,7 @@ public final class L2PcInstance extends L2Playable
             return;
         else
         {
-            L2PcInstance ptarget = (L2PcInstance)L2World.getInstance().findObject(_engageid);
+            L2PcInstance ptarget = L2World.getInstance().getPlayer(_engageid);
             setEngageRequest(false,0);
             if(ptarget!=null)
             {
@@ -9332,7 +9332,7 @@ public final class L2PcInstance extends L2Playable
 
     public boolean isInLooterParty(int LooterId)
     {
-    	L2PcInstance looter = (L2PcInstance)L2World.getInstance().findObject(LooterId);
+    	L2PcInstance looter = L2World.getInstance().getPlayer(LooterId);
 
     	// if L2PcInstance is in a CommandChannel
     	if (isInParty() && getParty().isInCommandChannel() && looter != null)
@@ -14606,9 +14606,9 @@ public final class L2PcInstance extends L2Playable
 		FriendStatusPacket pkt = new FriendStatusPacket(getObjectId());
 		for(int id : _friendList)
 		{
-			L2Object obj = L2World.getInstance().findObject(id);
-			if (obj != null)
-				obj.sendPacket(pkt);
+			L2PcInstance friend = L2World.getInstance().getPlayer(id);
+			if (friend != null)
+				friend.sendPacket(pkt);
 		}
 	}
 

L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2WeddingManagerInstance.java

@@ -68,7 +68,7 @@ public class L2WeddingManagerInstance extends L2Npc
 		}
 		else
 		{
-			L2PcInstance ptarget = (L2PcInstance) L2World.getInstance().findObject(player.getPartnerId());
+			L2PcInstance ptarget = L2World.getInstance().getPlayer(player.getPartnerId());
 			
 			// Is partner online?
 			if (ptarget == null || ptarget.isOnline() == 0)

L2_GameServer/java/com/l2jserver/gameserver/model/entity/Instance.java

@@ -26,7 +26,6 @@ import com.l2jserver.gameserver.datatables.MapRegionTable;
 import com.l2jserver.gameserver.datatables.NpcTable;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.instancemanager.InstanceManager;
-import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.L2WorldRegion;
@@ -194,7 +193,7 @@ public class Instance
 	 */
 	public void ejectPlayer(int objectId)
 	{
-		L2PcInstance player = (L2PcInstance) L2World.getInstance().findObject(objectId);
+		L2PcInstance player = L2World.getInstance().getPlayer(objectId);
 		if (player != null && player.getInstanceId() == this.getId())
 		{
 			player.setInstanceId(0);
@@ -642,11 +641,7 @@ public class Instance
 		@Override
 		public final boolean execute(final int objId)
 		{
-			L2Object find = L2World.getInstance().findObject(objId);
-			if (!(find instanceof L2PcInstance))
-				return true;
-			
-			L2PcInstance player = (L2PcInstance)find;
+			L2PcInstance player = L2World.getInstance().getPlayer(objId);
 			
 			if (player.getInstanceId() == getId())
 			{

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/AddTradeItem.java

@@ -65,7 +65,7 @@ public final class AddTradeItem extends L2GameClientPacket
 		}
 		
 		final L2PcInstance partner = trade.getPartner();
-		if (partner == null || L2World.getInstance().findObject(partner.getObjectId()) == null || partner.getActiveTradeList() == null)
+		if (partner == null || L2World.getInstance().getPlayer(partner.getObjectId()) == null || partner.getActiveTradeList() == null)
 		{
 			// Trade partner not found, cancel trade
 			if (partner != null)

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/AnswerTradeRequest.java

@@ -64,7 +64,7 @@ public final class AnswerTradeRequest extends L2GameClientPacket
 			msg = null;
 			return;
 		}
-		else if (L2World.getInstance().findObject(partner.getObjectId()) == null)
+		else if (L2World.getInstance().getPlayer(partner.getObjectId()) == null)
 		{
 			// Trade partner not found, cancel trade
 			player.sendPacket(new TradeDone(0));

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java

@@ -524,16 +524,15 @@ public class EnterWorld extends L2GameClientPacket
 	/**
 	* @param activeChar partnerid
 	*/
-	private void notifyPartner(L2PcInstance cha,int partnerId)
+	private void notifyPartner(L2PcInstance cha, int partnerId)
 	{
-		if (cha.getPartnerId()!=0)
+		if (cha.getPartnerId() != 0)
 		{
-			L2PcInstance partner;
 			int objId = cha.getPartnerId();
 
 			try
 			{
-				partner = (L2PcInstance)L2World.getInstance().findObject(cha.getPartnerId());
+				L2PcInstance partner = L2World.getInstance().getPlayer(objId);
 
 				if (partner != null)
 					partner.sendMessage("Your Partner has logged in.");

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java

@@ -14,7 +14,6 @@
  */
 package com.l2jserver.gameserver.network.clientpackets;
 
-import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.serverpackets.ExMPCCShowPartyMemberInfo;
@@ -41,12 +40,10 @@ public final class RequestExMPCCShowPartyMembersInfo extends L2GameClientPacket
 	@Override
 	protected void runImpl()
 	{
-		L2Object player = L2World.getInstance().findObject(_partyLeaderId);
-		if (player != null && 
-				player instanceof L2PcInstance && 
-				((L2PcInstance)player).getParty() != null)
+		L2PcInstance player = L2World.getInstance().getPlayer(_partyLeaderId);
+		if (player != null && player.getParty() != null)
         {
-			getClient().getActiveChar().sendPacket(new ExMPCCShowPartyMemberInfo(((L2PcInstance)player).getParty()));
+			getClient().getActiveChar().sendPacket(new ExMPCCShowPartyMemberInfo(player.getParty()));
 	        
         }
 	}

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java

@@ -46,7 +46,7 @@ public final class RequestRecipeShopMakeItem extends L2GameClientPacket
 		L2PcInstance activeChar = getClient().getActiveChar();
 		if (activeChar == null)
 			return;
-		L2PcInstance manufacturer = (L2PcInstance) L2World.getInstance().findObject(_id);
+		L2PcInstance manufacturer = L2World.getInstance().getPlayer(_id);
 		if (manufacturer == null)
 			return;
 		

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/SnoopQuit.java

@@ -42,8 +42,7 @@ public final class SnoopQuit extends L2GameClientPacket
 	@Override
 	protected void runImpl()
 	{
-		L2PcInstance player = (L2PcInstance) L2World.getInstance().findObject(
-				_snoopID);
+		L2PcInstance player = L2World.getInstance().getPlayer(_snoopID);
 		if (player == null)
 			return;
 		L2PcInstance activeChar = getClient().getActiveChar();

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/TradeDone.java

@@ -66,7 +66,7 @@ public final class TradeDone extends L2GameClientPacket
 		
 		if (_response == 1)
 		{
-			if (trade.getPartner() == null || L2World.getInstance().findObject(trade.getPartner().getObjectId()) == null)
+			if (trade.getPartner() == null || L2World.getInstance().getPlayer(trade.getPartner().getObjectId()) == null)
 			{
 				// Trade partner not found, cancel trade
 				player.cancelActiveTrade();

L2_GameServer/java/com/l2jserver/gameserver/network/communityserver/readpackets/RequestPlayerShowBoard.java

@@ -41,7 +41,7 @@ public final class RequestPlayerShowBoard extends BaseReadPacket
 		final int length = super.readD();
 		final byte[] html = super.readB(length);
 		
-		L2PcInstance player = (L2PcInstance)L2World.getInstance().findObject(playerObjId);
+		L2PcInstance player = L2World.getInstance().getPlayer(playerObjId);
 		if (player == null)
 		{
 			_log.info("error: player not found!!!");

L2_GameServer/java/com/l2jserver/gameserver/network/communityserver/readpackets/RequestPlayerShowMessage.java

@@ -42,7 +42,7 @@ public final class RequestPlayerShowMessage extends BaseReadPacket
 		final int playerObjId = super.readD();
 		final int type = super.readD();
 		
-		L2PcInstance player = (L2PcInstance)L2World.getInstance().findObject(playerObjId);
+		L2PcInstance player = L2World.getInstance().getPlayer(playerObjId);
 		if (player == null)
 		{
 			_log.info("error: player not found!!!");

L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/FriendList.java

@@ -17,7 +17,6 @@ package com.l2jserver.gameserver.network.serverpackets;
 import java.util.List;
 
 import com.l2jserver.gameserver.datatables.CharNameTable;
-import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
@@ -62,15 +61,12 @@ public class FriendList extends L2GameServerPacket
 		{
 			writeD(_friends.size());
 			for (int ObjId : _friends)
-			{				
-				String name = CharNameTable.getInstance().getNameById(ObjId);
-				L2Object obj = L2World.getInstance().findObject(ObjId);
+			{
+				String name = CharNameTable.getInstance().getNameById(ObjId); //TODO move to constructor
+				L2PcInstance player = L2World.getInstance().getPlayer(ObjId);
 				boolean online = false;
-				if (obj instanceof L2PcInstance)
-				{
-					if (((L2PcInstance) obj).isOnline() == 1)
-						online = true;
-				}
+				if (player != null && player.isOnline() == 1)
+					online = true;
 				writeD(ObjId); // character id
 				writeS(name);
 				writeD(online ? 0x01 : 0x00); // online