Player NPE check for Item setEnchantLevel.

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1035,7 +1035,11 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		final Player player = getActingPlayer();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
+		}
 	}
 	
 	/**

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1040,7 +1040,11 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		final Player player = getActingPlayer();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
+		}
 	}
 	
 	/**

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1040,7 +1040,11 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		final Player player = getActingPlayer();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
+		}
 	}
 	
 	/**

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1040,7 +1040,11 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		final Player player = getActingPlayer();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
+		}
 	}
 	
 	/**

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1044,48 +1044,54 @@ public class Item extends WorldObject
 		clearEnchantStats();
 		
 		// Agathion skills.
+		final Player player = getActingPlayer();
 		if (isEquipped() && (_itemTemplate.getBodyPart() == ItemTemplate.SLOT_AGATHION))
 		{
 			final AgathionSkillHolder agathionSkills = AgathionData.getInstance().getSkills(getId());
 			if (agathionSkills != null)
 			{
 				boolean update = false;
+				
 				// Remove old skills.
 				for (Skill skill : agathionSkills.getMainSkills(_enchantLevel))
 				{
-					getActingPlayer().removeSkill(skill, false, skill.isPassive());
+					player.removeSkill(skill, false, skill.isPassive());
 					update = true;
 				}
 				for (Skill skill : agathionSkills.getSubSkills(_enchantLevel))
 				{
-					getActingPlayer().removeSkill(skill, false, skill.isPassive());
+					player.removeSkill(skill, false, skill.isPassive());
 					update = true;
 				}
+				
 				// Add new skills.
 				if (getLocationSlot() == Inventory.PAPERDOLL_AGATHION1)
 				{
 					for (Skill skill : agathionSkills.getMainSkills(newLevel))
 					{
-						if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
+						if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
 						{
 							continue;
 						}
-						getActingPlayer().addSkill(skill, false);
+						
+						player.addSkill(skill, false);
 						update = true;
 					}
 				}
 				for (Skill skill : agathionSkills.getSubSkills(newLevel))
 				{
-					if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
+					if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
 					{
 						continue;
 					}
-					getActingPlayer().addSkill(skill, false);
+					
+					player.addSkill(skill, false);
 					update = true;
 				}
+				
 				if (update)
 				{
-					getActingPlayer().sendSkillList();
+					player.sendSkillList();
 				}
 			}
 		}
@@ -1094,12 +1100,15 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
 			
 			// Notify to Scripts
 			if (EventDispatcher.getInstance().hasListener(EventType.ON_ITEM_ENCHANT_ADD))
 			{
-			EventDispatcher.getInstance().notifyEventAsync(new OnItemEnchantAdd(getActingPlayer(), this));
+				EventDispatcher.getInstance().notifyEventAsync(new OnItemEnchantAdd(player, this));
+			}
 		}
 	}
 	

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1044,48 +1044,54 @@ public class Item extends WorldObject
 		clearEnchantStats();
 		
 		// Agathion skills.
+		final Player player = getActingPlayer();
 		if (isEquipped() && (_itemTemplate.getBodyPart() == ItemTemplate.SLOT_AGATHION))
 		{
 			final AgathionSkillHolder agathionSkills = AgathionData.getInstance().getSkills(getId());
 			if (agathionSkills != null)
 			{
 				boolean update = false;
+				
 				// Remove old skills.
 				for (Skill skill : agathionSkills.getMainSkills(_enchantLevel))
 				{
-					getActingPlayer().removeSkill(skill, false, skill.isPassive());
+					player.removeSkill(skill, false, skill.isPassive());
 					update = true;
 				}
 				for (Skill skill : agathionSkills.getSubSkills(_enchantLevel))
 				{
-					getActingPlayer().removeSkill(skill, false, skill.isPassive());
+					player.removeSkill(skill, false, skill.isPassive());
 					update = true;
 				}
+				
 				// Add new skills.
 				if (getLocationSlot() == Inventory.PAPERDOLL_AGATHION1)
 				{
 					for (Skill skill : agathionSkills.getMainSkills(newLevel))
 					{
-						if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
+						if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
 						{
 							continue;
 						}
-						getActingPlayer().addSkill(skill, false);
+						
+						player.addSkill(skill, false);
 						update = true;
 					}
 				}
 				for (Skill skill : agathionSkills.getSubSkills(newLevel))
 				{
-					if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
+					if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
 					{
 						continue;
 					}
-					getActingPlayer().addSkill(skill, false);
+					
+					player.addSkill(skill, false);
 					update = true;
 				}
+				
 				if (update)
 				{
-					getActingPlayer().sendSkillList();
+					player.sendSkillList();
 				}
 			}
 		}
@@ -1094,12 +1100,15 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
 			
 			// Notify to Scripts
 			if (EventDispatcher.getInstance().hasListener(EventType.ON_ITEM_ENCHANT_ADD))
 			{
-			EventDispatcher.getInstance().notifyEventAsync(new OnItemEnchantAdd(getActingPlayer(), this));
+				EventDispatcher.getInstance().notifyEventAsync(new OnItemEnchantAdd(player, this));
+			}
 		}
 	}
 	

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1044,48 +1044,54 @@ public class Item extends WorldObject
 		clearEnchantStats();
 		
 		// Agathion skills.
+		final Player player = getActingPlayer();
 		if (isEquipped() && (_itemTemplate.getBodyPart() == ItemTemplate.SLOT_AGATHION))
 		{
 			final AgathionSkillHolder agathionSkills = AgathionData.getInstance().getSkills(getId());
 			if (agathionSkills != null)
 			{
 				boolean update = false;
+				
 				// Remove old skills.
 				for (Skill skill : agathionSkills.getMainSkills(_enchantLevel))
 				{
-					getActingPlayer().removeSkill(skill, false, skill.isPassive());
+					player.removeSkill(skill, false, skill.isPassive());
 					update = true;
 				}
 				for (Skill skill : agathionSkills.getSubSkills(_enchantLevel))
 				{
-					getActingPlayer().removeSkill(skill, false, skill.isPassive());
+					player.removeSkill(skill, false, skill.isPassive());
 					update = true;
 				}
+				
 				// Add new skills.
 				if (getLocationSlot() == Inventory.PAPERDOLL_AGATHION1)
 				{
 					for (Skill skill : agathionSkills.getMainSkills(newLevel))
 					{
-						if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
+						if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
 						{
 							continue;
 						}
-						getActingPlayer().addSkill(skill, false);
+						
+						player.addSkill(skill, false);
 						update = true;
 					}
 				}
 				for (Skill skill : agathionSkills.getSubSkills(newLevel))
 				{
-					if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
+					if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
 					{
 						continue;
 					}
-					getActingPlayer().addSkill(skill, false);
+					
+					player.addSkill(skill, false);
 					update = true;
 				}
+				
 				if (update)
 				{
-					getActingPlayer().sendSkillList();
+					player.sendSkillList();
 				}
 			}
 		}
@@ -1094,12 +1100,15 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
 			
 			// Notify to Scripts
 			if (EventDispatcher.getInstance().hasListener(EventType.ON_ITEM_ENCHANT_ADD))
 			{
-			EventDispatcher.getInstance().notifyEventAsync(new OnItemEnchantAdd(getActingPlayer(), this));
+				EventDispatcher.getInstance().notifyEventAsync(new OnItemEnchantAdd(player, this));
+			}
 		}
 	}
 	

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1044,48 +1044,54 @@ public class Item extends WorldObject
 		clearEnchantStats();
 		
 		// Agathion skills.
+		final Player player = getActingPlayer();
 		if (isEquipped() && (_itemTemplate.getBodyPart() == ItemTemplate.SLOT_AGATHION))
 		{
 			final AgathionSkillHolder agathionSkills = AgathionData.getInstance().getSkills(getId());
 			if (agathionSkills != null)
 			{
 				boolean update = false;
+				
 				// Remove old skills.
 				for (Skill skill : agathionSkills.getMainSkills(_enchantLevel))
 				{
-					getActingPlayer().removeSkill(skill, false, skill.isPassive());
+					player.removeSkill(skill, false, skill.isPassive());
 					update = true;
 				}
 				for (Skill skill : agathionSkills.getSubSkills(_enchantLevel))
 				{
-					getActingPlayer().removeSkill(skill, false, skill.isPassive());
+					player.removeSkill(skill, false, skill.isPassive());
 					update = true;
 				}
+				
 				// Add new skills.
 				if (getLocationSlot() == Inventory.PAPERDOLL_AGATHION1)
 				{
 					for (Skill skill : agathionSkills.getMainSkills(newLevel))
 					{
-						if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
+						if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
 						{
 							continue;
 						}
-						getActingPlayer().addSkill(skill, false);
+						
+						player.addSkill(skill, false);
 						update = true;
 					}
 				}
 				for (Skill skill : agathionSkills.getSubSkills(newLevel))
 				{
-					if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
+					if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
 					{
 						continue;
 					}
-					getActingPlayer().addSkill(skill, false);
+					
+					player.addSkill(skill, false);
 					update = true;
 				}
+				
 				if (update)
 				{
-					getActingPlayer().sendSkillList();
+					player.sendSkillList();
 				}
 			}
 		}
@@ -1094,12 +1100,15 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
 			
 			// Notify to Scripts
 			if (EventDispatcher.getInstance().hasListener(EventType.ON_ITEM_ENCHANT_ADD))
 			{
-			EventDispatcher.getInstance().notifyEventAsync(new OnItemEnchantAdd(getActingPlayer(), this));
+				EventDispatcher.getInstance().notifyEventAsync(new OnItemEnchantAdd(player, this));
+			}
 		}
 	}
 	

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1044,48 +1044,54 @@ public class Item extends WorldObject
 		clearEnchantStats();
 		
 		// Agathion skills.
+		final Player player = getActingPlayer();
 		if (isEquipped() && (_itemTemplate.getBodyPart() == ItemTemplate.SLOT_AGATHION))
 		{
 			final AgathionSkillHolder agathionSkills = AgathionData.getInstance().getSkills(getId());
 			if (agathionSkills != null)
 			{
 				boolean update = false;
+				
 				// Remove old skills.
 				for (Skill skill : agathionSkills.getMainSkills(_enchantLevel))
 				{
-					getActingPlayer().removeSkill(skill, false, skill.isPassive());
+					player.removeSkill(skill, false, skill.isPassive());
 					update = true;
 				}
 				for (Skill skill : agathionSkills.getSubSkills(_enchantLevel))
 				{
-					getActingPlayer().removeSkill(skill, false, skill.isPassive());
+					player.removeSkill(skill, false, skill.isPassive());
 					update = true;
 				}
+				
 				// Add new skills.
 				if (getLocationSlot() == Inventory.PAPERDOLL_AGATHION1)
 				{
 					for (Skill skill : agathionSkills.getMainSkills(newLevel))
 					{
-						if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
+						if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
 						{
 							continue;
 						}
-						getActingPlayer().addSkill(skill, false);
+						
+						player.addSkill(skill, false);
 						update = true;
 					}
 				}
 				for (Skill skill : agathionSkills.getSubSkills(newLevel))
 				{
-					if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
+					if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
 					{
 						continue;
 					}
-					getActingPlayer().addSkill(skill, false);
+					
+					player.addSkill(skill, false);
 					update = true;
 				}
+				
 				if (update)
 				{
-					getActingPlayer().sendSkillList();
+					player.sendSkillList();
 				}
 			}
 		}
@@ -1094,12 +1100,15 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
 			
 			// Notify to Scripts
 			if (EventDispatcher.getInstance().hasListener(EventType.ON_ITEM_ENCHANT_ADD))
 			{
-			EventDispatcher.getInstance().notifyEventAsync(new OnItemEnchantAdd(getActingPlayer(), this));
+				EventDispatcher.getInstance().notifyEventAsync(new OnItemEnchantAdd(player, this));
+			}
 		}
 	}
 	

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1044,48 +1044,54 @@ public class Item extends WorldObject
 		clearEnchantStats();
 		
 		// Agathion skills.
+		final Player player = getActingPlayer();
 		if (isEquipped() && (_itemTemplate.getBodyPart() == ItemTemplate.SLOT_AGATHION))
 		{
 			final AgathionSkillHolder agathionSkills = AgathionData.getInstance().getSkills(getId());
 			if (agathionSkills != null)
 			{
 				boolean update = false;
+				
 				// Remove old skills.
 				for (Skill skill : agathionSkills.getMainSkills(_enchantLevel))
 				{
-					getActingPlayer().removeSkill(skill, false, skill.isPassive());
+					player.removeSkill(skill, false, skill.isPassive());
 					update = true;
 				}
 				for (Skill skill : agathionSkills.getSubSkills(_enchantLevel))
 				{
-					getActingPlayer().removeSkill(skill, false, skill.isPassive());
+					player.removeSkill(skill, false, skill.isPassive());
 					update = true;
 				}
+				
 				// Add new skills.
 				if (getLocationSlot() == Inventory.PAPERDOLL_AGATHION1)
 				{
 					for (Skill skill : agathionSkills.getMainSkills(newLevel))
 					{
-						if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
+						if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
 						{
 							continue;
 						}
-						getActingPlayer().addSkill(skill, false);
+						
+						player.addSkill(skill, false);
 						update = true;
 					}
 				}
 				for (Skill skill : agathionSkills.getSubSkills(newLevel))
 				{
-					if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
+					if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
 					{
 						continue;
 					}
-					getActingPlayer().addSkill(skill, false);
+					
+					player.addSkill(skill, false);
 					update = true;
 				}
+				
 				if (update)
 				{
-					getActingPlayer().sendSkillList();
+					player.sendSkillList();
 				}
 			}
 		}
@@ -1094,12 +1100,15 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
 			
 			// Notify to Scripts
 			if (EventDispatcher.getInstance().hasListener(EventType.ON_ITEM_ENCHANT_ADD))
 			{
-			EventDispatcher.getInstance().notifyEventAsync(new OnItemEnchantAdd(getActingPlayer(), this));
+				EventDispatcher.getInstance().notifyEventAsync(new OnItemEnchantAdd(player, this));
+			}
 		}
 	}
 	

L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1044,48 +1044,54 @@ public class Item extends WorldObject
 		clearEnchantStats();
 		
 		// Agathion skills.
+		final Player player = getActingPlayer();
 		if (isEquipped() && (_itemTemplate.getBodyPart() == ItemTemplate.SLOT_AGATHION))
 		{
 			final AgathionSkillHolder agathionSkills = AgathionData.getInstance().getSkills(getId());
 			if (agathionSkills != null)
 			{
 				boolean update = false;
+				
 				// Remove old skills.
 				for (Skill skill : agathionSkills.getMainSkills(_enchantLevel))
 				{
-					getActingPlayer().removeSkill(skill, false, skill.isPassive());
+					player.removeSkill(skill, false, skill.isPassive());
 					update = true;
 				}
 				for (Skill skill : agathionSkills.getSubSkills(_enchantLevel))
 				{
-					getActingPlayer().removeSkill(skill, false, skill.isPassive());
+					player.removeSkill(skill, false, skill.isPassive());
 					update = true;
 				}
+				
 				// Add new skills.
 				if (getLocationSlot() == Inventory.PAPERDOLL_AGATHION1)
 				{
 					for (Skill skill : agathionSkills.getMainSkills(newLevel))
 					{
-						if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
+						if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
 						{
 							continue;
 						}
-						getActingPlayer().addSkill(skill, false);
+						
+						player.addSkill(skill, false);
 						update = true;
 					}
 				}
 				for (Skill skill : agathionSkills.getSubSkills(newLevel))
 				{
-					if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
+					if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
 					{
 						continue;
 					}
-					getActingPlayer().addSkill(skill, false);
+					
+					player.addSkill(skill, false);
 					update = true;
 				}
+				
 				if (update)
 				{
-					getActingPlayer().sendSkillList();
+					player.sendSkillList();
 				}
 			}
 		}
@@ -1094,12 +1100,15 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
 			
 			// Notify to Scripts
 			if (EventDispatcher.getInstance().hasListener(EventType.ON_ITEM_ENCHANT_ADD))
 			{
-			EventDispatcher.getInstance().notifyEventAsync(new OnItemEnchantAdd(getActingPlayer(), this));
+				EventDispatcher.getInstance().notifyEventAsync(new OnItemEnchantAdd(player, this));
+			}
 		}
 	}
 	

L2J_Mobius_11.1_TheSourceOfFlame/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1044,48 +1044,54 @@ public class Item extends WorldObject
 		clearEnchantStats();
 		
 		// Agathion skills.
+		final Player player = getActingPlayer();
 		if (isEquipped() && (_itemTemplate.getBodyPart() == ItemTemplate.SLOT_AGATHION))
 		{
 			final AgathionSkillHolder agathionSkills = AgathionData.getInstance().getSkills(getId());
 			if (agathionSkills != null)
 			{
 				boolean update = false;
+				
 				// Remove old skills.
 				for (Skill skill : agathionSkills.getMainSkills(_enchantLevel))
 				{
-					getActingPlayer().removeSkill(skill, false, skill.isPassive());
+					player.removeSkill(skill, false, skill.isPassive());
 					update = true;
 				}
 				for (Skill skill : agathionSkills.getSubSkills(_enchantLevel))
 				{
-					getActingPlayer().removeSkill(skill, false, skill.isPassive());
+					player.removeSkill(skill, false, skill.isPassive());
 					update = true;
 				}
+				
 				// Add new skills.
 				if (getLocationSlot() == Inventory.PAPERDOLL_AGATHION1)
 				{
 					for (Skill skill : agathionSkills.getMainSkills(newLevel))
 					{
-						if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
+						if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
 						{
 							continue;
 						}
-						getActingPlayer().addSkill(skill, false);
+						
+						player.addSkill(skill, false);
 						update = true;
 					}
 				}
 				for (Skill skill : agathionSkills.getSubSkills(newLevel))
 				{
-					if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
+					if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
 					{
 						continue;
 					}
-					getActingPlayer().addSkill(skill, false);
+					
+					player.addSkill(skill, false);
 					update = true;
 				}
+				
 				if (update)
 				{
-					getActingPlayer().sendSkillList();
+					player.sendSkillList();
 				}
 			}
 		}
@@ -1094,12 +1100,15 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
 			
 			// Notify to Scripts
 			if (EventDispatcher.getInstance().hasListener(EventType.ON_ITEM_ENCHANT_ADD))
 			{
-			EventDispatcher.getInstance().notifyEventAsync(new OnItemEnchantAdd(getActingPlayer(), this));
+				EventDispatcher.getInstance().notifyEventAsync(new OnItemEnchantAdd(player, this));
+			}
 		}
 	}
 	

L2J_Mobius_11.2_AgeOfMagic/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1044,48 +1044,54 @@ public class Item extends WorldObject
 		clearEnchantStats();
 		
 		// Agathion skills.
+		final Player player = getActingPlayer();
 		if (isEquipped() && (_itemTemplate.getBodyPart() == ItemTemplate.SLOT_AGATHION))
 		{
 			final AgathionSkillHolder agathionSkills = AgathionData.getInstance().getSkills(getId());
 			if (agathionSkills != null)
 			{
 				boolean update = false;
+				
 				// Remove old skills.
 				for (Skill skill : agathionSkills.getMainSkills(_enchantLevel))
 				{
-					getActingPlayer().removeSkill(skill, false, skill.isPassive());
+					player.removeSkill(skill, false, skill.isPassive());
 					update = true;
 				}
 				for (Skill skill : agathionSkills.getSubSkills(_enchantLevel))
 				{
-					getActingPlayer().removeSkill(skill, false, skill.isPassive());
+					player.removeSkill(skill, false, skill.isPassive());
 					update = true;
 				}
+				
 				// Add new skills.
 				if (getLocationSlot() == Inventory.PAPERDOLL_AGATHION1)
 				{
 					for (Skill skill : agathionSkills.getMainSkills(newLevel))
 					{
-						if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
+						if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
 						{
 							continue;
 						}
-						getActingPlayer().addSkill(skill, false);
+						
+						player.addSkill(skill, false);
 						update = true;
 					}
 				}
 				for (Skill skill : agathionSkills.getSubSkills(newLevel))
 				{
-					if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
+					if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
 					{
 						continue;
 					}
-					getActingPlayer().addSkill(skill, false);
+					
+					player.addSkill(skill, false);
 					update = true;
 				}
+				
 				if (update)
 				{
-					getActingPlayer().sendSkillList();
+					player.sendSkillList();
 				}
 			}
 		}
@@ -1094,12 +1100,15 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
 			
 			// Notify to Scripts
 			if (EventDispatcher.getInstance().hasListener(EventType.ON_ITEM_ENCHANT_ADD))
 			{
-			EventDispatcher.getInstance().notifyEventAsync(new OnItemEnchantAdd(getActingPlayer(), this));
+				EventDispatcher.getInstance().notifyEventAsync(new OnItemEnchantAdd(player, this));
+			}
 		}
 	}
 	

L2J_Mobius_11.3_Shinemaker/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1044,48 +1044,54 @@ public class Item extends WorldObject
 		clearEnchantStats();
 		
 		// Agathion skills.
+		final Player player = getActingPlayer();
 		if (isEquipped() && (_itemTemplate.getBodyPart() == ItemTemplate.SLOT_AGATHION))
 		{
 			final AgathionSkillHolder agathionSkills = AgathionData.getInstance().getSkills(getId());
 			if (agathionSkills != null)
 			{
 				boolean update = false;
+				
 				// Remove old skills.
 				for (Skill skill : agathionSkills.getMainSkills(_enchantLevel))
 				{
-					getActingPlayer().removeSkill(skill, false, skill.isPassive());
+					player.removeSkill(skill, false, skill.isPassive());
 					update = true;
 				}
 				for (Skill skill : agathionSkills.getSubSkills(_enchantLevel))
 				{
-					getActingPlayer().removeSkill(skill, false, skill.isPassive());
+					player.removeSkill(skill, false, skill.isPassive());
 					update = true;
 				}
+				
 				// Add new skills.
 				if (getLocationSlot() == Inventory.PAPERDOLL_AGATHION1)
 				{
 					for (Skill skill : agathionSkills.getMainSkills(newLevel))
 					{
-						if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
+						if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
 						{
 							continue;
 						}
-						getActingPlayer().addSkill(skill, false);
+						
+						player.addSkill(skill, false);
 						update = true;
 					}
 				}
 				for (Skill skill : agathionSkills.getSubSkills(newLevel))
 				{
-					if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
+					if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
 					{
 						continue;
 					}
-					getActingPlayer().addSkill(skill, false);
+					
+					player.addSkill(skill, false);
 					update = true;
 				}
+				
 				if (update)
 				{
-					getActingPlayer().sendSkillList();
+					player.sendSkillList();
 				}
 			}
 		}
@@ -1094,12 +1100,15 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
 			
 			// Notify to Scripts
 			if (EventDispatcher.getInstance().hasListener(EventType.ON_ITEM_ENCHANT_ADD))
 			{
-			EventDispatcher.getInstance().notifyEventAsync(new OnItemEnchantAdd(getActingPlayer(), this));
+				EventDispatcher.getInstance().notifyEventAsync(new OnItemEnchantAdd(player, this));
+			}
 		}
 	}
 	

L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1035,7 +1035,11 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		final Player player = getActingPlayer();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
+		}
 	}
 	
 	/**

L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1035,7 +1035,11 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		final Player player = getActingPlayer();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
+		}
 	}
 	
 	/**

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1040,7 +1040,11 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		final Player player = getActingPlayer();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
+		}
 	}
 	
 	/**

L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1040,7 +1040,11 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		final Player player = getActingPlayer();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
+		}
 	}
 	
 	/**

L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1091,7 +1091,11 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		final Player player = getActingPlayer();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
+		}
 	}
 	
 	/**

L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1091,7 +1091,11 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		final Player player = getActingPlayer();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
+		}
 	}
 	
 	/**

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1091,7 +1091,11 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		final Player player = getActingPlayer();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
+		}
 	}
 	
 	/**

L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1091,7 +1091,11 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		final Player player = getActingPlayer();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
+		}
 	}
 	
 	/**

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1091,7 +1091,11 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		final Player player = getActingPlayer();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
+		}
 	}
 	
 	/**

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1035,7 +1035,11 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		final Player player = getActingPlayer();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
+		}
 	}
 	
 	/**

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1094,7 +1094,11 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		final Player player = getActingPlayer();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
+		}
 	}
 	
 	/**

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1094,7 +1094,11 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		final Player player = getActingPlayer();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
+		}
 	}
 	
 	/**

L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1095,7 +1095,11 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		final Player player = getActingPlayer();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
+		}
 	}
 	
 	/**

L2J_Mobius_Essence_7.1_Assassin/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1095,7 +1095,11 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		final Player player = getActingPlayer();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
+		}
 	}
 	
 	/**

L2J_Mobius_Essence_7.2_AztacansTemple/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1095,7 +1095,11 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		final Player player = getActingPlayer();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
+		}
 	}
 	
 	/**

L2J_Mobius_Essence_7.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -1095,7 +1095,11 @@ public class Item extends WorldObject
 		applyEnchantStats();
 		_storedInDb = false;
 		
-		getActingPlayer().getInventory().getPaperdollCache().clearArmorSetEnchant();
+		final Player player = getActingPlayer();
+		if (player != null)
+		{
+			player.getInventory().getPaperdollCache().clearArmorSetEnchant();
+		}
 	}
 	
 	/**