BETA: Misc changes.

	* Less null pointer checks.
	* Less object references in !L2PcInstance.

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

@@ -384,6 +384,8 @@ public final class L2PcInstance extends L2Playable
 	private static final String LOAD_ZONE_RESTART_LIMIT = "SELECT time_limit FROM character_norestart_zone_time WHERE charId = ?";
 	private static final String UPDATE_ZONE_RESTART_LIMIT = "REPLACE INTO character_norestart_zone_time (charId, time_limit) VALUES (?,?)";
 	
+	public static final int ID_NONE = -1;
+	
 	public static final int REQUEST_TIMEOUT = 15;
 	public static final int STORE_PRIVATE_NONE = 0;
 	public static final int STORE_PRIVATE_SELL = 1;
@@ -785,9 +787,9 @@ public final class L2PcInstance extends L2Playable
 	private int _expertisePenaltyBonus = 0;
 	
 	private boolean _isEnchanting = false;
-	private L2ItemInstance _activeEnchantItem = null;
-	private L2ItemInstance _activeEnchantSupportItem = null;
-	private L2ItemInstance _activeEnchantAttrItem = null;
+	private int _activeEnchantItemId = ID_NONE;
+	private int _activeEnchantSupportItemId = ID_NONE;
+	private int _activeEnchantAttrItemId = ID_NONE;
 	private long _activeEnchantTimestamp = 0;
 	
 	protected boolean _inventoryDisable = false;
@@ -2656,41 +2658,41 @@ public final class L2PcInstance extends L2Playable
 		return getStat().getExp();
 	}
 	
-	public void setActiveEnchantAttrItem(L2ItemInstance stone)
+	public void setActiveEnchantAttrItemId(int objectId)
 	{
-		_activeEnchantAttrItem = stone;
+		_activeEnchantAttrItemId = objectId;
 	}
 	
-	public L2ItemInstance getActiveEnchantAttrItem()
+	public int getActiveEnchantAttrItemId()
 	{
-		return _activeEnchantAttrItem;
+		return _activeEnchantAttrItemId;
 	}
 	
-	public void setActiveEnchantItem(L2ItemInstance scroll)
+	public void setActiveEnchantItemId(int objectId)
 	{
 		// If we don't have a Enchant Item, we are not enchanting.
-		if (scroll == null)
+		if (objectId == ID_NONE)
 		{
-			setActiveEnchantSupportItem(null);
+			setActiveEnchantSupportItemId(ID_NONE);
 			setActiveEnchantTimestamp(0);
 			setIsEnchanting(false);
 		}
-		_activeEnchantItem = scroll;
+		_activeEnchantItemId = objectId;
 	}
 	
-	public L2ItemInstance getActiveEnchantItem()
+	public int getActiveEnchantItemId()
 	{
-		return _activeEnchantItem;
+		return _activeEnchantItemId;
 	}
 	
-	public void setActiveEnchantSupportItem(L2ItemInstance item)
+	public void setActiveEnchantSupportItemId(int objectId)
 	{
-		_activeEnchantSupportItem = item;
+		_activeEnchantSupportItemId = objectId;
 	}
 	
-	public L2ItemInstance getActiveEnchantSupportItem()
+	public int getActiveEnchantSupportItemId()
 	{
-		return _activeEnchantSupportItem;
+		return _activeEnchantSupportItemId;
 	}
 	
 	public long getActiveEnchantTimestamp()
@@ -4055,7 +4057,7 @@ public final class L2PcInstance extends L2Playable
 	 * @param reference L2Object Object referencing current action like NPC selling item or previous item in transformation
 	 * @param sendMessage boolean Specifies whether to send message to Client about this action
 	 * @param protectItem whether or not dropped item must be protected temporary against other players
-	 * @return boolean informing if the action was successfull
+	 * @return boolean informing if the action was successful
 	 */
 	public boolean dropItem(String process, L2ItemInstance item, L2Object reference, boolean sendMessage, boolean protectItem)
 	{
@@ -4264,13 +4266,12 @@ public final class L2PcInstance extends L2Playable
 			return null;
 		}
 		
-		if ((getActiveEnchantItem() != null) && (getActiveEnchantItem().getObjectId() == objectId))
+		if (getActiveEnchantItemId() == objectId)
 		{
 			if (Config.DEBUG)
 			{
 				_log.finest(getObjectId() + ":player tried to " + action + " an enchant scroll he was using");
 			}
-			
 			return null;
 		}
 		
@@ -11646,13 +11647,12 @@ public final class L2PcInstance extends L2Playable
 			return false;
 		}
 		
-		if ((getActiveEnchantItem() != null) && (getActiveEnchantItem().getObjectId() == objectId))
+		if (getActiveEnchantItemId() == objectId)
 		{
 			if (Config.DEBUG)
 			{
 				_log.finest(getObjectId() + ":player tried to " + action + " an enchant scroll he was using");
 			}
-			
 			return false;
 		}
 		

L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/PcInventory.java

@@ -755,9 +755,9 @@ public class PcInventory extends Inventory
 		getOwner().removeItemFromShortCut(item.getObjectId());
 		
 		// Removes active Enchant Scroll
-		if (item.equals(getOwner().getActiveEnchantItem()))
+		if (item.getObjectId() == getOwner().getActiveEnchantItemId())
 		{
-			getOwner().setActiveEnchantItem(null);
+			getOwner().setActiveEnchantItemId(L2PcInstance.ID_NONE);
 		}
 		
 		if (item.getItemId() == ADENA_ID)

L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/instance/L2ItemInstance.java

@@ -881,7 +881,9 @@ public final class L2ItemInstance extends L2Object
 			&& (getItem().getType2() != L2Item.TYPE2_QUEST) // Not Quest Item
 			&& ((getItem().getType2() != L2Item.TYPE2_MONEY) || (getItem().getType1() != L2Item.TYPE1_SHIELD_ARMOR)) // not money, not shield
 			&& (!player.hasSummon() || (getObjectId() != player.getSummon().getControlObjectId())) // Not Control item of currently summoned pet
-			&& (player.getActiveEnchantItem() != this) // Not momentarily used enchant scroll
+			&& (player.getActiveEnchantItemId() != getObjectId()) // Not momentarily used enchant scroll
+			&& (player.getActiveEnchantSupportItemId() != getObjectId()) // Not momentarily used enchant support item
+			&& (player.getActiveEnchantAttrItemId() != getObjectId()) // Not momentarily used enchant attribute item
 			&& (allowAdena || (getItemId() != PcInventory.ADENA_ID)) // Not Adena
 			&& ((player.getCurrentSkill() == null) || (player.getCurrentSkill().getSkill().getItemConsumeId() != getItemId())) && (!player.isCastingSimultaneouslyNow() || (player.getLastSimultaneousSkillCast() == null) || (player.getLastSimultaneousSkillCast().getItemConsumeId() != getItemId())) && (allowNonTradeable || (isTradeable() && (!((getItem().getItemType() == L2EtcItemType.PET_COLLAR) && player.havePetInvItems())))));
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/Logout.java

@@ -24,7 +24,6 @@ import java.util.logging.Logger;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.SevenSignsFestival;
-import com.l2jserver.gameserver.model.L2Party;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.L2Event;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -50,16 +49,18 @@ public final class Logout extends L2GameClientPacket
 	@Override
 	protected void runImpl()
 	{
-		// Don't allow leaving if player is fighting
 		final L2PcInstance player = getClient().getActiveChar();
-		
 		if (player == null)
 		{
 			return;
 		}
 		
-		if ((player.getActiveEnchantItem() != null) || (player.getActiveEnchantAttrItem() != null))
+		if ((player.getActiveEnchantItemId() != L2PcInstance.ID_NONE) || (player.getActiveEnchantAttrItemId() != L2PcInstance.ID_NONE))
 		{
+			if (Config.DEBUG)
+			{
+				_log.fine("Player " + player.getName() + " tried to logout while enchanting.");
+			}
 			player.sendPacket(ActionFailed.STATIC_PACKET);
 			return;
 		}
@@ -71,6 +72,7 @@ public final class Logout extends L2GameClientPacket
 			return;
 		}
 		
+		// Don't allow leaving if player is fighting
 		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player))
 		{
 			if (player.isGM() && Config.GM_RESTART_FIGHTING)
@@ -80,7 +82,7 @@ public final class Logout extends L2GameClientPacket
 			
 			if (Config.DEBUG)
 			{
-				_log.fine("Player " + player.getName() + " tried to logout while fighting");
+				_log.fine("Player " + player.getName() + " tried to logout while fighting.");
 			}
 			
 			player.sendPacket(SystemMessageId.CANT_LOGOUT_WHILE_FIGHTING);
@@ -106,9 +108,8 @@ public final class Logout extends L2GameClientPacket
 				player.sendPacket(ActionFailed.STATIC_PACKET);
 				return;
 			}
-			final L2Party playerParty = player.getParty();
 			
-			if (playerParty != null)
+			if (player.isInParty())
 			{
 				player.getParty().broadcastPacket(SystemMessage.sendString(player.getName() + " has been removed from the upcoming Festival."));
 			}

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestEnchantItem.java

@@ -71,24 +71,24 @@ public final class RequestEnchantItem extends L2GameClientPacket
 		
 		if (!activeChar.isOnline() || getClient().isDetached())
 		{
-			activeChar.setActiveEnchantItem(null);
+			activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
 			return;
 		}
 		
 		if (activeChar.isProcessingTransaction() || activeChar.isInStoreMode())
 		{
 			activeChar.sendPacket(SystemMessageId.CANNOT_ENCHANT_WHILE_STORE);
-			activeChar.setActiveEnchantItem(null);
+			activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
 			return;
 		}
 		
-		L2ItemInstance item = activeChar.getInventory().getItemByObjectId(_objectId);
-		L2ItemInstance scroll = activeChar.getActiveEnchantItem();
-		L2ItemInstance support = activeChar.getActiveEnchantSupportItem();
+		final L2ItemInstance item = activeChar.getInventory().getItemByObjectId(_objectId);
+		L2ItemInstance scroll = activeChar.getInventory().getItemByObjectId(activeChar.getActiveEnchantItemId());
+		L2ItemInstance support = activeChar.getInventory().getItemByObjectId(activeChar.getActiveEnchantSupportItemId());
 		
 		if ((item == null) || (scroll == null))
 		{
-			activeChar.setActiveEnchantItem(null);
+			activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
 			return;
 		}
 		
@@ -107,7 +107,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
 		{
 			if (support.getObjectId() != _supportId)
 			{
-				activeChar.setActiveEnchantItem(null);
+				activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
 				return;
 			}
 			supportTemplate = EnchantItemData.getInstance().getSupportItem(support);
@@ -117,7 +117,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
 		if (!scrollTemplate.isValid(item, supportTemplate))
 		{
 			activeChar.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITION);
-			activeChar.setActiveEnchantItem(null);
+			activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
 			activeChar.sendPacket(new EnchantResult(2, 0, 0));
 			return;
 		}
@@ -126,7 +126,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
 		if ((activeChar.getActiveEnchantTimestamp() == 0) || ((System.currentTimeMillis() - activeChar.getActiveEnchantTimestamp()) < 2000))
 		{
 			Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " use autoenchant program ", Config.DEFAULT_PUNISH);
-			activeChar.setActiveEnchantItem(null);
+			activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
 			activeChar.sendPacket(new EnchantResult(2, 0, 0));
 			return;
 		}
@@ -137,7 +137,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
 		{
 			activeChar.sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS);
 			Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to enchant with a scroll he doesn't have", Config.DEFAULT_PUNISH);
-			activeChar.setActiveEnchantItem(null);
+			activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
 			activeChar.sendPacket(new EnchantResult(2, 0, 0));
 			return;
 		}
@@ -150,7 +150,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
 			{
 				activeChar.sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS);
 				Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to enchant with a support item he doesn't have", Config.DEFAULT_PUNISH);
-				activeChar.setActiveEnchantItem(null);
+				activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
 				activeChar.sendPacket(new EnchantResult(2, 0, 0));
 				return;
 			}
@@ -167,7 +167,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
 			if ((item.getOwnerId() != activeChar.getObjectId()) || (item.isEnchantable() == 0) || (chance < 0))
 			{
 				activeChar.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITION);
-				activeChar.setActiveEnchantItem(null);
+				activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
 				activeChar.sendPacket(new EnchantResult(2, 0, 0));
 				return;
 			}
@@ -315,7 +315,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
 						{
 							// unable to destroy item, cheater ?
 							Util.handleIllegalPlayerAction(activeChar, "Unable to delete item on enchant failure from player " + activeChar.getName() + ", possible cheater !", Config.DEFAULT_PUNISH);
-							activeChar.setActiveEnchantItem(null);
+							activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
 							activeChar.sendPacket(new EnchantResult(2, 0, 0));
 							
 							if (Config.LOG_ITEM_ENCHANTS)
@@ -432,7 +432,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
 			}
 			activeChar.sendPacket(iu);
 			activeChar.broadcastUserInfo();
-			activeChar.setActiveEnchantItem(null);
+			activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
 		}
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExCancelEnchantItem.java

@@ -41,7 +41,7 @@ public class RequestExCancelEnchantItem extends L2GameClientPacket
 		if (activeChar != null)
 		{
 			activeChar.sendPacket(new EnchantResult(2, 0, 0));
-			activeChar.setActiveEnchantItem(null);
+			activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
 		}
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java

@@ -46,7 +46,7 @@ public class RequestExEnchantItemAttribute extends L2GameClientPacket
 	@Override
 	protected void runImpl()
 	{
-		L2PcInstance player = getClient().getActiveChar();
+		final L2PcInstance player = getActiveChar();
 		if (player == null)
 		{
 			return;
@@ -55,21 +55,21 @@ public class RequestExEnchantItemAttribute extends L2GameClientPacket
 		if (_objectId == 0xFFFFFFFF)
 		{
 			// Player canceled enchant
-			player.setActiveEnchantAttrItem(null);
+			player.setActiveEnchantAttrItemId(L2PcInstance.ID_NONE);
 			player.sendPacket(SystemMessageId.ELEMENTAL_ENHANCE_CANCELED);
 			return;
 		}
 		
 		if (!player.isOnline())
 		{
-			player.setActiveEnchantAttrItem(null);
+			player.setActiveEnchantAttrItemId(L2PcInstance.ID_NONE);
 			return;
 		}
 		
 		if (player.getPrivateStoreType() != L2PcInstance.STORE_PRIVATE_NONE)
 		{
 			player.sendPacket(SystemMessageId.CANNOT_ADD_ELEMENTAL_POWER_WHILE_OPERATING_PRIVATE_STORE_OR_WORKSHOP);
-			player.setActiveEnchantAttrItem(null);
+			player.setActiveEnchantAttrItemId(L2PcInstance.ID_NONE);
 			return;
 		}
 		
@@ -78,23 +78,24 @@ public class RequestExEnchantItemAttribute extends L2GameClientPacket
 		{
 			// Cancel trade
 			player.cancelActiveTrade();
-			player.setActiveEnchantAttrItem(null);
-			player.sendMessage("Enchanting items is not allowed during a trade.");
+			player.setActiveEnchantAttrItemId(L2PcInstance.ID_NONE);
+			player.sendMessage("You cannot add elemental power while trading.");
 			return;
 		}
 		
-		L2ItemInstance item = player.getInventory().getItemByObjectId(_objectId);
-		L2ItemInstance stone = player.getActiveEnchantAttrItem();
+		final L2ItemInstance item = player.getInventory().getItemByObjectId(_objectId);
+		final L2ItemInstance stone = player.getInventory().getItemByObjectId(player.getActiveEnchantAttrItemId());
 		if ((item == null) || (stone == null))
 		{
-			player.setActiveEnchantAttrItem(null);
+			player.setActiveEnchantAttrItemId(L2PcInstance.ID_NONE);
+			player.sendPacket(SystemMessageId.ELEMENTAL_ENHANCE_CANCELED);
 			return;
 		}
 		
 		if (!item.isElementable())
 		{
 			player.sendPacket(SystemMessageId.ELEMENTAL_ENHANCE_REQUIREMENT_NOT_SUFFICIENT);
-			player.setActiveEnchantAttrItem(null);
+			player.setActiveEnchantAttrItemId(L2PcInstance.ID_NONE);
 			return;
 		}
 		
@@ -105,14 +106,14 @@ public class RequestExEnchantItemAttribute extends L2GameClientPacket
 			{
 				if (item.getOwnerId() != player.getObjectId())
 				{
-					player.setActiveEnchantAttrItem(null);
+					player.setActiveEnchantAttrItemId(L2PcInstance.ID_NONE);
 					return;
 				}
 				break;
 			}
 			default:
 			{
-				player.setActiveEnchantAttrItem(null);
+				player.setActiveEnchantAttrItemId(L2PcInstance.ID_NONE);
 				Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH);
 				return;
 			}
@@ -135,7 +136,7 @@ public class RequestExEnchantItemAttribute extends L2GameClientPacket
 		if ((item.isWeapon() && (oldElement != null) && (oldElement.getElement() != elementToAdd) && (oldElement.getElement() != -2)) || (item.isArmor() && (item.getElemental(elementToAdd) == null) && (item.getElementals() != null) && (item.getElementals().length >= 3)))
 		{
 			player.sendPacket(SystemMessageId.ANOTHER_ELEMENTAL_POWER_ALREADY_ADDED);
-			player.setActiveEnchantAttrItem(null);
+			player.setActiveEnchantAttrItemId(L2PcInstance.ID_NONE);
 			return;
 		}
 		
@@ -146,7 +147,7 @@ public class RequestExEnchantItemAttribute extends L2GameClientPacket
 			{
 				if (elm.getElement() == opositeElement)
 				{
-					player.setActiveEnchantAttrItem(null);
+					player.setActiveEnchantAttrItemId(L2PcInstance.ID_NONE);
 					Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to add oposite attribute to item!", Config.DEFAULT_PUNISH);
 					return;
 				}
@@ -163,7 +164,7 @@ public class RequestExEnchantItemAttribute extends L2GameClientPacket
 		if (powerToAdd <= 0)
 		{
 			player.sendPacket(SystemMessageId.ELEMENTAL_ENHANCE_CANCELED);
-			player.setActiveEnchantAttrItem(null);
+			player.setActiveEnchantAttrItemId(L2PcInstance.ID_NONE);
 			return;
 		}
 		
@@ -171,7 +172,7 @@ public class RequestExEnchantItemAttribute extends L2GameClientPacket
 		{
 			player.sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS);
 			Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to attribute enchant with a stone he doesn't have", Config.DEFAULT_PUNISH);
-			player.setActiveEnchantAttrItem(null);
+			player.setActiveEnchantAttrItemId(L2PcInstance.ID_NONE);
 			return;
 		}
 		boolean success = false;
@@ -251,7 +252,7 @@ public class RequestExEnchantItemAttribute extends L2GameClientPacket
 		player.sendPacket(new ExAttributeEnchantResult(powerToAdd));
 		player.sendPacket(new UserInfo(player));
 		player.sendPacket(new ExBrExtraUserInfo(player));
-		player.setActiveEnchantAttrItem(null);
+		player.setActiveEnchantAttrItemId(L2PcInstance.ID_NONE);
 	}
 	
 	public int getLimit(L2ItemInstance item, int sotneId)

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java

@@ -64,11 +64,11 @@ public class RequestExTryToPutEnchantSupportItem extends L2GameClientPacket
 				{
 					// message may be custom
 					activeChar.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITION);
-					activeChar.setActiveEnchantSupportItem(null);
+					activeChar.setActiveEnchantSupportItemId(L2PcInstance.ID_NONE);
 					activeChar.sendPacket(new ExPutEnchantSupportItemResult(0));
 					return;
 				}
-				activeChar.setActiveEnchantSupportItem(support);
+				activeChar.setActiveEnchantSupportItemId(support.getObjectId());
 				activeChar.sendPacket(new ExPutEnchantSupportItemResult(_supportObjectId));
 			}
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java

@@ -58,7 +58,7 @@ public class RequestExTryToPutEnchantTargetItem extends L2GameClientPacket
 		}
 		
 		L2ItemInstance item = activeChar.getInventory().getItemByObjectId(_objectId);
-		L2ItemInstance scroll = activeChar.getActiveEnchantItem();
+		L2ItemInstance scroll = activeChar.getInventory().getItemByObjectId(activeChar.getActiveEnchantItemId());
 		
 		if ((item == null) || (scroll == null))
 		{
@@ -69,7 +69,7 @@ public class RequestExTryToPutEnchantTargetItem extends L2GameClientPacket
 		if ((scrollTemplate == null) || !scrollTemplate.isValid(item))
 		{
 			activeChar.sendPacket(SystemMessageId.DOES_NOT_FIT_SCROLL_CONDITIONS);
-			activeChar.setActiveEnchantItem(null);
+			activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
 			activeChar.sendPacket(new ExPutEnchantTargetItemResult(0));
 			if (scrollTemplate == null)
 			{

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestGetItemFromPet.java

@@ -61,7 +61,7 @@ public final class RequestGetItemFromPet extends L2GameClientPacket
 		}
 		
 		final L2PetInstance pet = (L2PetInstance) player.getSummon();
-		if (player.getActiveEnchantItem() != null)
+		if (player.getActiveEnchantItemId() != L2PcInstance.ID_NONE)
 		{
 			return;
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestGiveItemToPet.java

@@ -58,7 +58,7 @@ public final class RequestGiveItemToPet extends L2GameClientPacket
 			return;
 		}
 		
-		if (player.getActiveEnchantItem() != null)
+		if (player.getActiveEnchantItemId() != L2PcInstance.ID_NONE)
 		{
 			return;
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestPackageSend.java

@@ -99,7 +99,7 @@ public class RequestPackageSend extends L2GameClientPacket
 			return;
 		}
 		
-		if (player.getActiveEnchantItem() != null)
+		if (player.getActiveEnchantItemId() != L2PcInstance.ID_NONE)
 		{
 			Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH);
 			return;

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestRestart.java

@@ -64,7 +64,7 @@ public final class RequestRestart extends L2GameClientPacket
 			return;
 		}
 		
-		if ((player.getActiveEnchantItem() != null) || (player.getActiveEnchantAttrItem() != null))
+		if ((player.getActiveEnchantItemId() != L2PcInstance.ID_NONE) || (player.getActiveEnchantAttrItemId() != L2PcInstance.ID_NONE))
 		{
 			sendPacket(RestartResponse.valueOf(false));
 			return;

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/SendWareHouseDepositList.java

@@ -109,7 +109,7 @@ public final class SendWareHouseDepositList extends L2GameClientPacket
 			return;
 		}
 		
-		if (player.getActiveEnchantItem() != null)
+		if (player.getActiveEnchantItemId() != L2PcInstance.ID_NONE)
 		{
 			Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!", Config.DEFAULT_PUNISH);
 			return;

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

@@ -78,7 +78,7 @@ public final class TradeDone extends L2GameClientPacket
 				return;
 			}
 			
-			if ((trade.getOwner().getActiveEnchantItem() != null) || (trade.getPartner().getActiveEnchantItem() != null))
+			if ((trade.getOwner().getActiveEnchantItemId() != L2PcInstance.ID_NONE) || (trade.getPartner().getActiveEnchantItemId() != L2PcInstance.ID_NONE))
 			{
 				return;
 			}