L2Pet#getControlItemId method rename to avoid confusion.

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

@@ -752,7 +752,7 @@ public final class L2ItemInstance extends L2Object
 		(!isEquipped()) // Not equipped
     		&& (getItem().getType2() != L2Item.TYPE2_QUEST) // Not Quest Item
     		&& (getItem().getType2() != L2Item.TYPE2_MONEY || getItem().getType1() != L2Item.TYPE1_SHIELD_ARMOR) // not money, not shield
-    		&& (player.getPet() == null || getObjectId() != player.getPet().getControlItemId()) // Not Control item of currently summoned pet
+    		&& (player.getPet() == null || getObjectId() != player.getPet().getControlObjectId()) // Not Control item of currently summoned pet
     		&& (player.getActiveEnchantItem() != this) // Not momentarily used enchant scroll
     		&& (allowAdena || getItemId() != 57) // Not adena
     		&& (player.getCurrentSkill() == null || player.getCurrentSkill().getSkill().getItemConsumeId() != getItemId())

L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Summon.java

@@ -439,7 +439,7 @@ public abstract class L2Summon extends L2Playable
         return _chargedSpiritShot;
     }
 
-    public int getControlItemId()
+    public int getControlObjectId()
     {
         return 0;
     }

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

@@ -4138,7 +4138,7 @@ public final class L2PcInstance extends L2Playable
 		}
 
 		// Pet is summoned and not the item that summoned the pet AND not the buggle from strider you're mounting
-		if (getPet() != null && getPet().getControlItemId() == objectId || getMountObjectID() == objectId)
+		if (getPet() != null && getPet().getControlObjectId() == objectId || getMountObjectID() == objectId)
 		{
 			if (Config.DEBUG)
 				_log.finest(getObjectId()+": player tried to " + action + " item controling pet");
@@ -5680,7 +5680,7 @@ public final class L2PcInstance extends L2Playable
 							!itemDrop.isDropable() ||
 							itemDrop.getItemId() == 57 || // Adena
 							itemDrop.getItem().getType2() == L2Item.TYPE2_QUEST ||                  // Quest Items
-							getPet() != null && getPet().getControlItemId() == itemDrop.getItemId() || // Control Item of active pet
+							getPet() != null && getPet().getControlObjectId() == itemDrop.getItemId() || // Control Item of active pet
 							Arrays.binarySearch(Config.KARMA_LIST_NONDROPPABLE_ITEMS, itemDrop.getItemId()) >= 0 || // Item listed in the non droppable item list
 							Arrays.binarySearch(Config.KARMA_LIST_NONDROPPABLE_PET_ITEMS, itemDrop.getItemId()) >= 0 // Item listed in the non droppable pet item list
 					) continue;
@@ -6707,7 +6707,7 @@ public final class L2PcInstance extends L2Playable
         stopAllToggles();
         Ride mount = new Ride(this, true, pet.getTemplate().npcId);
         setMount(pet.getNpcId(), pet.getLevel(), mount.getMountType());
-        setMountObjectID(pet.getControlItemId());
+        setMountObjectID(pet.getControlObjectId());
         clearPetData();
         startFeed(pet.getNpcId());
         broadcastPacket(mount);
@@ -11474,7 +11474,7 @@ public final class L2PcInstance extends L2Playable
 		}
 
 		// Pet is summoned and not the item that summoned the pet AND not the buggle from strider you're mounting
-		if (getPet() != null && getPet().getControlItemId() == objectId || getMountObjectID() == objectId)
+		if (getPet() != null && getPet().getControlObjectId() == objectId || getMountObjectID() == objectId)
 		{
 			if (Config.DEBUG)
 				_log.finest(getObjectId()+": player tried to " + action + " item controling pet");
@@ -13707,7 +13707,7 @@ public final class L2PcInstance extends L2Playable
     	if (getPet() != null)
     	{
     		setCurrentFeed(((L2PetInstance) getPet()).getCurrentFed());
-    		_controlItemId = getPet().getControlItemId();
+    		_controlItemId = getPet().getControlObjectId();
     		sendPacket(new SetupGauge(3, getCurrentFeed()*10000/getFeedConsume(), getMaxFeed()*10000/getFeedConsume()));
     		if (!isDead())
     		{

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

@@ -74,7 +74,7 @@ public class L2PetInstance extends L2Summon
 	
 	private int _curFed;
 	private PetInventory _inventory;
-	private final int _controlItemId;
+	private final int _controlObjectId;
 	private boolean _respawned;
 	private boolean _mountable;
 	private Future<?> _feedTask;
@@ -174,7 +174,7 @@ public class L2PetInstance extends L2Summon
 							stopFeed();
 							sm = new SystemMessage(SystemMessageId.STARVING_GRUMPY_AND_FED_UP_YOUR_PET_HAS_LEFT);
 							getOwner().sendPacket(sm);
-							_log.info("Hungry pet deleted for player :"+getOwner().getName()+" Control Item Id :"+getControlItemId());
+							_log.info("Hungry pet deleted for player :"+getOwner()+" Control Item Id :"+getControlObjectId());
 							deleteMe(getOwner());
 						}
 					}
@@ -187,7 +187,7 @@ public class L2PetInstance extends L2Summon
 							stopFeed();
 							sm = new SystemMessage(SystemMessageId.STARVING_GRUMPY_AND_FED_UP_YOUR_PET_HAS_LEFT);
 							getOwner().sendPacket(sm);
-							_log.info("Hungry pet deleted for player :"+getOwner().getName()+" Control Item Id :"+getControlItemId());
+							_log.info("Hungry pet deleted for player :"+getOwner()+" Control Item Id :"+getControlObjectId());
 							deleteMe(getOwner());
 						}
 					}
@@ -254,7 +254,7 @@ public class L2PetInstance extends L2Summon
 		super(objectId, template, owner);
 		setInstanceType(InstanceType.L2PetInstance);
 		
-		_controlItemId = control.getObjectId();
+		_controlObjectId = control.getObjectId();
 		
 		// Pet's initial level is supposed to be read from DB
 		// Pets start at :
@@ -296,11 +296,11 @@ public class L2PetInstance extends L2Summon
 	public int getSummonType() { return 2; }
 	
 	@Override
-	public int getControlItemId() { return _controlItemId; }
+	public int getControlObjectId() { return _controlObjectId; }
 	
 	public L2ItemInstance getControlItem()
 	{
-		return getOwner().getInventory().getItemByObjectId(_controlItemId);
+		return getOwner().getInventory().getItemByObjectId(_controlObjectId);
 	}
 	
 	public int getCurrentFed() { return _curFed; }
@@ -732,11 +732,11 @@ public class L2PetInstance extends L2Summon
 			L2ItemInstance removedItem;
 			if (evolve)
 			{
-				removedItem = owner.getInventory().destroyItem("Evolve", getControlItemId(), 1, getOwner(), this);
+				removedItem = owner.getInventory().destroyItem("Evolve", getControlObjectId(), 1, getOwner(), this);
 			}
 			else
 			{
-				removedItem = owner.getInventory().destroyItem("PetDestroy", getControlItemId(), 1, getOwner(), this);
+				removedItem = owner.getInventory().destroyItem("PetDestroy", getControlObjectId(), 1, getOwner(), this);
 				if (removedItem != null)
 					owner.sendPacket(new SystemMessage(SystemMessageId.S1_DISAPPEARED).addItemName(removedItem));
 			}
@@ -769,7 +769,7 @@ public class L2PetInstance extends L2Summon
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
 			PreparedStatement statement = con.prepareStatement("DELETE FROM pets WHERE item_obj_id=?");
-			statement.setInt(1, getControlItemId());
+			statement.setInt(1, getControlObjectId());
 			statement.execute();
 			statement.close();
 		}
@@ -889,7 +889,7 @@ public class L2PetInstance extends L2Summon
 		}
 		catch (Exception e)
 		{
-			_logPet.log(Level.WARNING, "Could not restore pet data: "+ e.getMessage(), e);
+			_logPet.log(Level.WARNING, "Could not restore pet data for owner: "+owner+" - "+ e.getMessage(), e);
 			return null;
 		}
 		finally
@@ -901,7 +901,7 @@ public class L2PetInstance extends L2Summon
 	@Override
 	public void store()
 	{
-		if (getControlItemId() == 0)
+		if (getControlObjectId() == 0)
 		{
 			// this is a summon, not a pet, don't store anything
 			return;
@@ -929,7 +929,7 @@ public class L2PetInstance extends L2Summon
 			statement.setInt(8, getWeapon());
 			statement.setInt(9, getArmor());
 			statement.setInt(10, getJewel());
-			statement.setInt(11, getControlItemId());
+			statement.setInt(11, getControlObjectId());
 			statement.executeUpdate();
 			statement.close();
 			_respawned = true;

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

@@ -150,7 +150,7 @@ public final class RequestDestroyItem extends L2GameClientPacket
 			Connection con = null;
 			try
 			{
-				if (activeChar.getPet() != null && activeChar.getPet().getControlItemId() == _objectId)
+				if (activeChar.getPet() != null && activeChar.getPet().getControlObjectId() == _objectId)
 				{
 					activeChar.getPet().unSummon(activeChar);
 				}

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

@@ -63,7 +63,7 @@ public class SellList extends L2GameServerPacket
 				if (!item.isEquipped() &&														// Not equipped
                         item.isSellable() &&													// Item is sellable
                         (_activeChar.getPet() == null ||										// Pet not summoned or
-                        item.getObjectId() != _activeChar.getPet().getControlItemId()))			// Pet is summoned and not the item that summoned the pet
+                        item.getObjectId() != _activeChar.getPet().getControlObjectId()))			// Pet is summoned and not the item that summoned the pet
 				{
 					_selllist.add(item);
 					if (Config.DEBUG)