Reverted latest Inventory checkEquipTask changes.

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -1426,24 +1426,17 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if (_skillItemTask == null)
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
-			final Creature owner = getOwner();
+			getOwner().getActingPlayer().setUsingSkillItem(true);
-			if ((owner != null) && owner.isPlayer())
+			_skillItemTask = ThreadPool.schedule(() ->
 			{
-				final Player player = owner.getActingPlayer();
+				getOwner().getActingPlayer().setUsingSkillItem(false);
-				if (player.hasEnteredWorld())
+				getOwner().getStat().recalculateStats(true);
-				{
+				getOwner().updateAbnormalVisualEffects();
-					_skillItemTask = ThreadPool.schedule(() ->
+				getOwner().getActingPlayer().sendSkillList();
-					{
+				_skillItemTask = null;
-						player.setUsingSkillItem(false);
+			}, 50);
-						player.getStat().recalculateStats(true);
-						player.updateAbnormalVisualEffects();
-						player.sendSkillList();
-						_skillItemTask = null;
-					}, 50);
-				}
-			}
 		}
 	}
 	

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -1432,24 +1432,17 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if (_skillItemTask == null)
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
-			final Creature owner = getOwner();
+			getOwner().getActingPlayer().setUsingSkillItem(true);
-			if ((owner != null) && owner.isPlayer())
+			_skillItemTask = ThreadPool.schedule(() ->
 			{
-				final Player player = owner.getActingPlayer();
+				getOwner().getActingPlayer().setUsingSkillItem(false);
-				if (player.hasEnteredWorld())
+				getOwner().getStat().recalculateStats(true);
-				{
+				getOwner().updateAbnormalVisualEffects();
-					_skillItemTask = ThreadPool.schedule(() ->
+				getOwner().getActingPlayer().sendSkillList();
-					{
+				_skillItemTask = null;
-						player.setUsingSkillItem(false);
+			}, 50);
-						player.getStat().recalculateStats(true);
-						player.updateAbnormalVisualEffects();
-						player.sendSkillList();
-						_skillItemTask = null;
-					}, 50);
-				}
-			}
 		}
 	}
 	

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -1432,24 +1432,17 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if (_skillItemTask == null)
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
-			final Creature owner = getOwner();
+			getOwner().getActingPlayer().setUsingSkillItem(true);
-			if ((owner != null) && owner.isPlayer())
+			_skillItemTask = ThreadPool.schedule(() ->
 			{
-				final Player player = owner.getActingPlayer();
+				getOwner().getActingPlayer().setUsingSkillItem(false);
-				if (player.hasEnteredWorld())
+				getOwner().getStat().recalculateStats(true);
-				{
+				getOwner().updateAbnormalVisualEffects();
-					_skillItemTask = ThreadPool.schedule(() ->
+				getOwner().getActingPlayer().sendSkillList();
-					{
+				_skillItemTask = null;
-						player.setUsingSkillItem(false);
+			}, 50);
-						player.getStat().recalculateStats(true);
-						player.updateAbnormalVisualEffects();
-						player.sendSkillList();
-						_skillItemTask = null;
-					}, 50);
-				}
-			}
 		}
 	}
 	

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -1432,24 +1432,17 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if (_skillItemTask == null)
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
-			final Creature owner = getOwner();
+			getOwner().getActingPlayer().setUsingSkillItem(true);
-			if ((owner != null) && owner.isPlayer())
+			_skillItemTask = ThreadPool.schedule(() ->
 			{
-				final Player player = owner.getActingPlayer();
+				getOwner().getActingPlayer().setUsingSkillItem(false);
-				if (player.hasEnteredWorld())
+				getOwner().getStat().recalculateStats(true);
-				{
+				getOwner().updateAbnormalVisualEffects();
-					_skillItemTask = ThreadPool.schedule(() ->
+				getOwner().getActingPlayer().sendSkillList();
-					{
+				_skillItemTask = null;
-						player.setUsingSkillItem(false);
+			}, 50);
-						player.getStat().recalculateStats(true);
-						player.updateAbnormalVisualEffects();
-						player.sendSkillList();
-						_skillItemTask = null;
-					}, 50);
-				}
-			}
 		}
 	}
 	

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -1534,24 +1534,17 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if (_skillItemTask == null)
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
-			final Creature owner = getOwner();
+			getOwner().getActingPlayer().setUsingSkillItem(true);
-			if ((owner != null) && owner.isPlayer())
+			_skillItemTask = ThreadPool.schedule(() ->
 			{
-				final Player player = owner.getActingPlayer();
+				getOwner().getActingPlayer().setUsingSkillItem(false);
-				if (player.hasEnteredWorld())
+				getOwner().getStat().recalculateStats(true);
-				{
+				getOwner().updateAbnormalVisualEffects();
-					_skillItemTask = ThreadPool.schedule(() ->
+				getOwner().getActingPlayer().sendSkillList();
-					{
+				_skillItemTask = null;
-						player.setUsingSkillItem(false);
+			}, 50);
-						player.getStat().recalculateStats(true);
-						player.updateAbnormalVisualEffects();
-						player.sendSkillList();
-						_skillItemTask = null;
-					}, 50);
-				}
-			}
 		}
 	}
 	

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -1616,24 +1616,17 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if (_skillItemTask == null)
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
-			final Creature owner = getOwner();
+			getOwner().getActingPlayer().setUsingSkillItem(true);
-			if ((owner != null) && owner.isPlayer())
+			_skillItemTask = ThreadPool.schedule(() ->
 			{
-				final Player player = owner.getActingPlayer();
+				getOwner().getActingPlayer().setUsingSkillItem(false);
-				if (player.hasEnteredWorld())
+				getOwner().getStat().recalculateStats(true);
-				{
+				getOwner().updateAbnormalVisualEffects();
-					_skillItemTask = ThreadPool.schedule(() ->
+				getOwner().getActingPlayer().sendSkillList();
-					{
+				_skillItemTask = null;
-						player.setUsingSkillItem(false);
+			}, 50);
-						player.getStat().recalculateStats(true);
-						player.updateAbnormalVisualEffects();
-						player.sendSkillList();
-						_skillItemTask = null;
-					}, 50);
-				}
-			}
 		}
 	}
 	

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -1616,24 +1616,17 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if (_skillItemTask == null)
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
-			final Creature owner = getOwner();
+			getOwner().getActingPlayer().setUsingSkillItem(true);
-			if ((owner != null) && owner.isPlayer())
+			_skillItemTask = ThreadPool.schedule(() ->
 			{
-				final Player player = owner.getActingPlayer();
+				getOwner().getActingPlayer().setUsingSkillItem(false);
-				if (player.hasEnteredWorld())
+				getOwner().getStat().recalculateStats(true);
-				{
+				getOwner().updateAbnormalVisualEffects();
-					_skillItemTask = ThreadPool.schedule(() ->
+				getOwner().getActingPlayer().sendSkillList();
-					{
+				_skillItemTask = null;
-						player.setUsingSkillItem(false);
+			}, 50);
-						player.getStat().recalculateStats(true);
-						player.updateAbnormalVisualEffects();
-						player.sendSkillList();
-						_skillItemTask = null;
-					}, 50);
-				}
-			}
 		}
 	}
 	

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -1610,24 +1610,17 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if (_skillItemTask == null)
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
-			final Creature owner = getOwner();
+			getOwner().getActingPlayer().setUsingSkillItem(true);
-			if ((owner != null) && owner.isPlayer())
+			_skillItemTask = ThreadPool.schedule(() ->
 			{
-				final Player player = owner.getActingPlayer();
+				getOwner().getActingPlayer().setUsingSkillItem(false);
-				if (player.hasEnteredWorld())
+				getOwner().getStat().recalculateStats(true);
-				{
+				getOwner().updateAbnormalVisualEffects();
-					_skillItemTask = ThreadPool.schedule(() ->
+				getOwner().getActingPlayer().sendSkillList();
-					{
+				_skillItemTask = null;
-						player.setUsingSkillItem(false);
+			}, 50);
-						player.getStat().recalculateStats(true);
-						player.updateAbnormalVisualEffects();
-						player.sendSkillList();
-						_skillItemTask = null;
-					}, 50);
-				}
-			}
 		}
 	}
 	

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -1592,24 +1592,17 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if (_skillItemTask == null)
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
-			final Creature owner = getOwner();
+			getOwner().getActingPlayer().setUsingSkillItem(true);
-			if ((owner != null) && owner.isPlayer())
+			_skillItemTask = ThreadPool.schedule(() ->
 			{
-				final Player player = owner.getActingPlayer();
+				getOwner().getActingPlayer().setUsingSkillItem(false);
-				if (player.hasEnteredWorld())
+				getOwner().getStat().recalculateStats(true);
-				{
+				getOwner().updateAbnormalVisualEffects();
-					_skillItemTask = ThreadPool.schedule(() ->
+				getOwner().getActingPlayer().sendSkillList();
-					{
+				_skillItemTask = null;
-						player.setUsingSkillItem(false);
+			}, 50);
-						player.getStat().recalculateStats(true);
-						player.updateAbnormalVisualEffects();
-						player.sendSkillList();
-						_skillItemTask = null;
-					}, 50);
-				}
-			}
 		}
 	}
 	

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -1592,24 +1592,17 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if (_skillItemTask == null)
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
-			final Creature owner = getOwner();
+			getOwner().getActingPlayer().setUsingSkillItem(true);
-			if ((owner != null) && owner.isPlayer())
+			_skillItemTask = ThreadPool.schedule(() ->
 			{
-				final Player player = owner.getActingPlayer();
+				getOwner().getActingPlayer().setUsingSkillItem(false);
-				if (player.hasEnteredWorld())
+				getOwner().getStat().recalculateStats(true);
-				{
+				getOwner().updateAbnormalVisualEffects();
-					_skillItemTask = ThreadPool.schedule(() ->
+				getOwner().getActingPlayer().sendSkillList();
-					{
+				_skillItemTask = null;
-						player.setUsingSkillItem(false);
+			}, 50);
-						player.getStat().recalculateStats(true);
-						player.updateAbnormalVisualEffects();
-						player.sendSkillList();
-						_skillItemTask = null;
-					}, 50);
-				}
-			}
 		}
 	}
 	

L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -1603,24 +1603,17 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if (_skillItemTask == null)
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
-			final Creature owner = getOwner();
+			getOwner().getActingPlayer().setUsingSkillItem(true);
-			if ((owner != null) && owner.isPlayer())
+			_skillItemTask = ThreadPool.schedule(() ->
 			{
-				final Player player = owner.getActingPlayer();
+				getOwner().getActingPlayer().setUsingSkillItem(false);
-				if (player.hasEnteredWorld())
+				getOwner().getStat().recalculateStats(true);
-				{
+				getOwner().updateAbnormalVisualEffects();
-					_skillItemTask = ThreadPool.schedule(() ->
+				getOwner().getActingPlayer().sendSkillList();
-					{
+				_skillItemTask = null;
-						player.setUsingSkillItem(false);
+			}, 50);
-						player.getStat().recalculateStats(true);
-						player.updateAbnormalVisualEffects();
-						player.sendSkillList();
-						_skillItemTask = null;
-					}, 50);
-				}
-			}
 		}
 	}
 	

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -1603,24 +1603,17 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if (_skillItemTask == null)
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
-			final Creature owner = getOwner();
+			getOwner().getActingPlayer().setUsingSkillItem(true);
-			if ((owner != null) && owner.isPlayer())
+			_skillItemTask = ThreadPool.schedule(() ->
 			{
-				final Player player = owner.getActingPlayer();
+				getOwner().getActingPlayer().setUsingSkillItem(false);
-				if (player.hasEnteredWorld())
+				getOwner().getStat().recalculateStats(true);
-				{
+				getOwner().updateAbnormalVisualEffects();
-					_skillItemTask = ThreadPool.schedule(() ->
+				getOwner().getActingPlayer().sendSkillList();
-					{
+				_skillItemTask = null;
-						player.setUsingSkillItem(false);
+			}, 50);
-						player.getStat().recalculateStats(true);
-						player.updateAbnormalVisualEffects();
-						player.sendSkillList();
-						_skillItemTask = null;
-					}, 50);
-				}
-			}
 		}
 	}
 	

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -1434,24 +1434,17 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if (_skillItemTask == null)
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
-			final Creature owner = getOwner();
+			getOwner().getActingPlayer().setUsingSkillItem(true);
-			if ((owner != null) && owner.isPlayer())
+			_skillItemTask = ThreadPool.schedule(() ->
 			{
-				final Player player = owner.getActingPlayer();
+				getOwner().getActingPlayer().setUsingSkillItem(false);
-				if (player.hasEnteredWorld())
+				getOwner().getStat().recalculateStats(true);
-				{
+				getOwner().updateAbnormalVisualEffects();
-					_skillItemTask = ThreadPool.schedule(() ->
+				getOwner().getActingPlayer().sendSkillList();
-					{
+				_skillItemTask = null;
-						player.setUsingSkillItem(false);
+			}, 50);
-						player.getStat().recalculateStats(true);
-						player.updateAbnormalVisualEffects();
-						player.sendSkillList();
-						_skillItemTask = null;
-					}, 50);
-				}
-			}
 		}
 	}
 	

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -1434,24 +1434,17 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if (_skillItemTask == null)
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
-			final Creature owner = getOwner();
+			getOwner().getActingPlayer().setUsingSkillItem(true);
-			if ((owner != null) && owner.isPlayer())
+			_skillItemTask = ThreadPool.schedule(() ->
 			{
-				final Player player = owner.getActingPlayer();
+				getOwner().getActingPlayer().setUsingSkillItem(false);
-				if (player.hasEnteredWorld())
+				getOwner().getStat().recalculateStats(true);
-				{
+				getOwner().updateAbnormalVisualEffects();
-					_skillItemTask = ThreadPool.schedule(() ->
+				getOwner().getActingPlayer().sendSkillList();
-					{
+				_skillItemTask = null;
-						player.setUsingSkillItem(false);
+			}, 50);
-						player.getStat().recalculateStats(true);
-						player.updateAbnormalVisualEffects();
-						player.sendSkillList();
-						_skillItemTask = null;
-					}, 50);
-				}
-			}
 		}
 	}
 	

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -1536,24 +1536,17 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if (_skillItemTask == null)
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
-			final Creature owner = getOwner();
+			getOwner().getActingPlayer().setUsingSkillItem(true);
-			if ((owner != null) && owner.isPlayer())
+			_skillItemTask = ThreadPool.schedule(() ->
 			{
-				final Player player = owner.getActingPlayer();
+				getOwner().getActingPlayer().setUsingSkillItem(false);
-				if (player.hasEnteredWorld())
+				getOwner().getStat().recalculateStats(true);
-				{
+				getOwner().updateAbnormalVisualEffects();
-					_skillItemTask = ThreadPool.schedule(() ->
+				getOwner().getActingPlayer().sendSkillList();
-					{
+				_skillItemTask = null;
-						player.setUsingSkillItem(false);
+			}, 50);
-						player.getStat().recalculateStats(true);
-						player.updateAbnormalVisualEffects();
-						player.sendSkillList();
-						_skillItemTask = null;
-					}, 50);
-				}
-			}
 		}
 	}
 	

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -1618,24 +1618,17 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if (_skillItemTask == null)
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
-			final Creature owner = getOwner();
+			getOwner().getActingPlayer().setUsingSkillItem(true);
-			if ((owner != null) && owner.isPlayer())
+			_skillItemTask = ThreadPool.schedule(() ->
 			{
-				final Player player = owner.getActingPlayer();
+				getOwner().getActingPlayer().setUsingSkillItem(false);
-				if (player.hasEnteredWorld())
+				getOwner().getStat().recalculateStats(true);
-				{
+				getOwner().updateAbnormalVisualEffects();
-					_skillItemTask = ThreadPool.schedule(() ->
+				getOwner().getActingPlayer().sendSkillList();
-					{
+				_skillItemTask = null;
-						player.setUsingSkillItem(false);
+			}, 50);
-						player.getStat().recalculateStats(true);
-						player.updateAbnormalVisualEffects();
-						player.sendSkillList();
-						_skillItemTask = null;
-					}, 50);
-				}
-			}
 		}
 	}
 	

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -1618,24 +1618,17 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if (_skillItemTask == null)
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
-			final Creature owner = getOwner();
+			getOwner().getActingPlayer().setUsingSkillItem(true);
-			if ((owner != null) && owner.isPlayer())
+			_skillItemTask = ThreadPool.schedule(() ->
 			{
-				final Player player = owner.getActingPlayer();
+				getOwner().getActingPlayer().setUsingSkillItem(false);
-				if (player.hasEnteredWorld())
+				getOwner().getStat().recalculateStats(true);
-				{
+				getOwner().updateAbnormalVisualEffects();
-					_skillItemTask = ThreadPool.schedule(() ->
+				getOwner().getActingPlayer().sendSkillList();
-					{
+				_skillItemTask = null;
-						player.setUsingSkillItem(false);
+			}, 50);
-						player.getStat().recalculateStats(true);
-						player.updateAbnormalVisualEffects();
-						player.sendSkillList();
-						_skillItemTask = null;
-					}, 50);
-				}
-			}
 		}
 	}
 	

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -1612,24 +1612,17 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if (_skillItemTask == null)
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
-			final Creature owner = getOwner();
+			getOwner().getActingPlayer().setUsingSkillItem(true);
-			if ((owner != null) && owner.isPlayer())
+			_skillItemTask = ThreadPool.schedule(() ->
 			{
-				final Player player = owner.getActingPlayer();
+				getOwner().getActingPlayer().setUsingSkillItem(false);
-				if (player.hasEnteredWorld())
+				getOwner().getStat().recalculateStats(true);
-				{
+				getOwner().updateAbnormalVisualEffects();
-					_skillItemTask = ThreadPool.schedule(() ->
+				getOwner().getActingPlayer().sendSkillList();
-					{
+				_skillItemTask = null;
-						player.setUsingSkillItem(false);
+			}, 50);
-						player.getStat().recalculateStats(true);
-						player.updateAbnormalVisualEffects();
-						player.sendSkillList();
-						_skillItemTask = null;
-					}, 50);
-				}
-			}
 		}
 	}
 	

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -1426,24 +1426,17 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if (_skillItemTask == null)
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
-			final Creature owner = getOwner();
+			getOwner().getActingPlayer().setUsingSkillItem(true);
-			if ((owner != null) && owner.isPlayer())
+			_skillItemTask = ThreadPool.schedule(() ->
 			{
-				final Player player = owner.getActingPlayer();
+				getOwner().getActingPlayer().setUsingSkillItem(false);
-				if (player.hasEnteredWorld())
+				getOwner().getStat().recalculateStats(true);
-				{
+				getOwner().updateAbnormalVisualEffects();
-					_skillItemTask = ThreadPool.schedule(() ->
+				getOwner().getActingPlayer().sendSkillList();
-					{
+				_skillItemTask = null;
-						player.setUsingSkillItem(false);
+			}, 50);
-						player.getStat().recalculateStats(true);
-						player.updateAbnormalVisualEffects();
-						player.sendSkillList();
-						_skillItemTask = null;
-					}, 50);
-				}
-			}
 		}
 	}
 	

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -1720,24 +1720,17 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if (_skillItemTask == null)
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
-			final Creature owner = getOwner();
+			getOwner().getActingPlayer().setUsingSkillItem(true);
-			if ((owner != null) && owner.isPlayer())
+			_skillItemTask = ThreadPool.schedule(() ->
 			{
-				final Player player = owner.getActingPlayer();
+				getOwner().getActingPlayer().setUsingSkillItem(false);
-				if (player.hasEnteredWorld())
+				getOwner().getStat().recalculateStats(true);
-				{
+				getOwner().updateAbnormalVisualEffects();
-					_skillItemTask = ThreadPool.schedule(() ->
+				getOwner().getActingPlayer().sendSkillList();
-					{
+				_skillItemTask = null;
-						player.setUsingSkillItem(false);
+			}, 50);
-						player.getStat().recalculateStats(true);
-						player.updateAbnormalVisualEffects();
-						player.sendSkillList();
-						_skillItemTask = null;
-					}, 50);
-				}
-			}
 		}
 	}
 	

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -1729,24 +1729,17 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if (_skillItemTask == null)
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
-			final Creature owner = getOwner();
+			getOwner().getActingPlayer().setUsingSkillItem(true);
-			if ((owner != null) && owner.isPlayer())
+			_skillItemTask = ThreadPool.schedule(() ->
 			{
-				final Player player = owner.getActingPlayer();
+				getOwner().getActingPlayer().setUsingSkillItem(false);
-				if (player.hasEnteredWorld())
+				getOwner().getStat().recalculateStats(true);
-				{
+				getOwner().updateAbnormalVisualEffects();
-					_skillItemTask = ThreadPool.schedule(() ->
+				getOwner().getActingPlayer().sendSkillList();
-					{
+				_skillItemTask = null;
-						player.setUsingSkillItem(false);
+			}, 50);
-						player.getStat().recalculateStats(true);
-						player.updateAbnormalVisualEffects();
-						player.sendSkillList();
-						_skillItemTask = null;
-					}, 50);
-				}
-			}
 		}
 	}
 	

L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -1729,24 +1729,17 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if (_skillItemTask == null)
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
-			final Creature owner = getOwner();
+			getOwner().getActingPlayer().setUsingSkillItem(true);
-			if ((owner != null) && owner.isPlayer())
+			_skillItemTask = ThreadPool.schedule(() ->
 			{
-				final Player player = owner.getActingPlayer();
+				getOwner().getActingPlayer().setUsingSkillItem(false);
-				if (player.hasEnteredWorld())
+				getOwner().getStat().recalculateStats(true);
-				{
+				getOwner().updateAbnormalVisualEffects();
-					_skillItemTask = ThreadPool.schedule(() ->
+				getOwner().getActingPlayer().sendSkillList();
-					{
+				_skillItemTask = null;
-						player.setUsingSkillItem(false);
+			}, 50);
-						player.getStat().recalculateStats(true);
-						player.updateAbnormalVisualEffects();
-						player.sendSkillList();
-						_skillItemTask = null;
-					}, 50);
-				}
-			}
 		}
 	}
 	

L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -1729,24 +1729,17 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if (_skillItemTask == null)
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
-			final Creature owner = getOwner();
+			getOwner().getActingPlayer().setUsingSkillItem(true);
-			if ((owner != null) && owner.isPlayer())
+			_skillItemTask = ThreadPool.schedule(() ->
 			{
-				final Player player = owner.getActingPlayer();
+				getOwner().getActingPlayer().setUsingSkillItem(false);
-				if (player.hasEnteredWorld())
+				getOwner().getStat().recalculateStats(true);
-				{
+				getOwner().updateAbnormalVisualEffects();
-					_skillItemTask = ThreadPool.schedule(() ->
+				getOwner().getActingPlayer().sendSkillList();
-					{
+				_skillItemTask = null;
-						player.setUsingSkillItem(false);
+			}, 50);
-						player.getStat().recalculateStats(true);
-						player.updateAbnormalVisualEffects();
-						player.sendSkillList();
-						_skillItemTask = null;
-					}, 50);
-				}
-			}
 		}
 	}