diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 78bac08bd5..125b819a3c 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1426,17 +1426,25 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
+		if (_skillItemTask == null)
 		{
-			getOwner().getActingPlayer().setUsingSkillItem(true);
-			_skillItemTask = ThreadPool.schedule(() ->
+			final Creature owner = getOwner();
+			if ((owner != null) && owner.isPlayer())
 			{
-				getOwner().getActingPlayer().setUsingSkillItem(false);
-				getOwner().getStat().recalculateStats(true);
-				getOwner().updateAbnormalVisualEffects();
-				getOwner().getActingPlayer().sendSkillList();
-				_skillItemTask = null;
-			}, 50);
+				final Player player = owner.getActingPlayer();
+				if (player.hasEnteredWorld())
+				{
+					player.setUsingSkillItem(true);
+					_skillItemTask = ThreadPool.schedule(() ->
+					{
+						player.setUsingSkillItem(false);
+						player.getStat().recalculateStats(true);
+						player.updateAbnormalVisualEffects();
+						player.sendSkillList();
+						_skillItemTask = null;
+					}, 50);
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 88cd0ebdf3..aff392aa2d 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1432,17 +1432,25 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
+		if (_skillItemTask == null)
 		{
-			getOwner().getActingPlayer().setUsingSkillItem(true);
-			_skillItemTask = ThreadPool.schedule(() ->
+			final Creature owner = getOwner();
+			if ((owner != null) && owner.isPlayer())
 			{
-				getOwner().getActingPlayer().setUsingSkillItem(false);
-				getOwner().getStat().recalculateStats(true);
-				getOwner().updateAbnormalVisualEffects();
-				getOwner().getActingPlayer().sendSkillList();
-				_skillItemTask = null;
-			}, 50);
+				final Player player = owner.getActingPlayer();
+				if (player.hasEnteredWorld())
+				{
+					player.setUsingSkillItem(true);
+					_skillItemTask = ThreadPool.schedule(() ->
+					{
+						player.setUsingSkillItem(false);
+						player.getStat().recalculateStats(true);
+						player.updateAbnormalVisualEffects();
+						player.sendSkillList();
+						_skillItemTask = null;
+					}, 50);
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 88cd0ebdf3..aff392aa2d 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1432,17 +1432,25 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
+		if (_skillItemTask == null)
 		{
-			getOwner().getActingPlayer().setUsingSkillItem(true);
-			_skillItemTask = ThreadPool.schedule(() ->
+			final Creature owner = getOwner();
+			if ((owner != null) && owner.isPlayer())
 			{
-				getOwner().getActingPlayer().setUsingSkillItem(false);
-				getOwner().getStat().recalculateStats(true);
-				getOwner().updateAbnormalVisualEffects();
-				getOwner().getActingPlayer().sendSkillList();
-				_skillItemTask = null;
-			}, 50);
+				final Player player = owner.getActingPlayer();
+				if (player.hasEnteredWorld())
+				{
+					player.setUsingSkillItem(true);
+					_skillItemTask = ThreadPool.schedule(() ->
+					{
+						player.setUsingSkillItem(false);
+						player.getStat().recalculateStats(true);
+						player.updateAbnormalVisualEffects();
+						player.sendSkillList();
+						_skillItemTask = null;
+					}, 50);
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index ed552364d9..513ecbb9e4 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1432,17 +1432,25 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
+		if (_skillItemTask == null)
 		{
-			getOwner().getActingPlayer().setUsingSkillItem(true);
-			_skillItemTask = ThreadPool.schedule(() ->
+			final Creature owner = getOwner();
+			if ((owner != null) && owner.isPlayer())
 			{
-				getOwner().getActingPlayer().setUsingSkillItem(false);
-				getOwner().getStat().recalculateStats(true);
-				getOwner().updateAbnormalVisualEffects();
-				getOwner().getActingPlayer().sendSkillList();
-				_skillItemTask = null;
-			}, 50);
+				final Player player = owner.getActingPlayer();
+				if (player.hasEnteredWorld())
+				{
+					player.setUsingSkillItem(true);
+					_skillItemTask = ThreadPool.schedule(() ->
+					{
+						player.setUsingSkillItem(false);
+						player.getStat().recalculateStats(true);
+						player.updateAbnormalVisualEffects();
+						player.sendSkillList();
+						_skillItemTask = null;
+					}, 50);
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index a8ec81d6af..45eabb4870 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1534,17 +1534,25 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
+		if (_skillItemTask == null)
 		{
-			getOwner().getActingPlayer().setUsingSkillItem(true);
-			_skillItemTask = ThreadPool.schedule(() ->
+			final Creature owner = getOwner();
+			if ((owner != null) && owner.isPlayer())
 			{
-				getOwner().getActingPlayer().setUsingSkillItem(false);
-				getOwner().getStat().recalculateStats(true);
-				getOwner().updateAbnormalVisualEffects();
-				getOwner().getActingPlayer().sendSkillList();
-				_skillItemTask = null;
-			}, 50);
+				final Player player = owner.getActingPlayer();
+				if (player.hasEnteredWorld())
+				{
+					player.setUsingSkillItem(true);
+					_skillItemTask = ThreadPool.schedule(() ->
+					{
+						player.setUsingSkillItem(false);
+						player.getStat().recalculateStats(true);
+						player.updateAbnormalVisualEffects();
+						player.sendSkillList();
+						_skillItemTask = null;
+					}, 50);
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 998fcb6f21..de2508ff69 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1616,17 +1616,25 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
+		if (_skillItemTask == null)
 		{
-			getOwner().getActingPlayer().setUsingSkillItem(true);
-			_skillItemTask = ThreadPool.schedule(() ->
+			final Creature owner = getOwner();
+			if ((owner != null) && owner.isPlayer())
 			{
-				getOwner().getActingPlayer().setUsingSkillItem(false);
-				getOwner().getStat().recalculateStats(true);
-				getOwner().updateAbnormalVisualEffects();
-				getOwner().getActingPlayer().sendSkillList();
-				_skillItemTask = null;
-			}, 50);
+				final Player player = owner.getActingPlayer();
+				if (player.hasEnteredWorld())
+				{
+					player.setUsingSkillItem(true);
+					_skillItemTask = ThreadPool.schedule(() ->
+					{
+						player.setUsingSkillItem(false);
+						player.getStat().recalculateStats(true);
+						player.updateAbnormalVisualEffects();
+						player.sendSkillList();
+						_skillItemTask = null;
+					}, 50);
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 998fcb6f21..de2508ff69 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1616,17 +1616,25 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
+		if (_skillItemTask == null)
 		{
-			getOwner().getActingPlayer().setUsingSkillItem(true);
-			_skillItemTask = ThreadPool.schedule(() ->
+			final Creature owner = getOwner();
+			if ((owner != null) && owner.isPlayer())
 			{
-				getOwner().getActingPlayer().setUsingSkillItem(false);
-				getOwner().getStat().recalculateStats(true);
-				getOwner().updateAbnormalVisualEffects();
-				getOwner().getActingPlayer().sendSkillList();
-				_skillItemTask = null;
-			}, 50);
+				final Player player = owner.getActingPlayer();
+				if (player.hasEnteredWorld())
+				{
+					player.setUsingSkillItem(true);
+					_skillItemTask = ThreadPool.schedule(() ->
+					{
+						player.setUsingSkillItem(false);
+						player.getStat().recalculateStats(true);
+						player.updateAbnormalVisualEffects();
+						player.sendSkillList();
+						_skillItemTask = null;
+					}, 50);
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 2710aaf2b6..772e514662 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1610,17 +1610,25 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
+		if (_skillItemTask == null)
 		{
-			getOwner().getActingPlayer().setUsingSkillItem(true);
-			_skillItemTask = ThreadPool.schedule(() ->
+			final Creature owner = getOwner();
+			if ((owner != null) && owner.isPlayer())
 			{
-				getOwner().getActingPlayer().setUsingSkillItem(false);
-				getOwner().getStat().recalculateStats(true);
-				getOwner().updateAbnormalVisualEffects();
-				getOwner().getActingPlayer().sendSkillList();
-				_skillItemTask = null;
-			}, 50);
+				final Player player = owner.getActingPlayer();
+				if (player.hasEnteredWorld())
+				{
+					player.setUsingSkillItem(true);
+					_skillItemTask = ThreadPool.schedule(() ->
+					{
+						player.setUsingSkillItem(false);
+						player.getStat().recalculateStats(true);
+						player.updateAbnormalVisualEffects();
+						player.sendSkillList();
+						_skillItemTask = null;
+					}, 50);
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 2312258df6..a96ae2b74e 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1592,17 +1592,25 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
+		if (_skillItemTask == null)
 		{
-			getOwner().getActingPlayer().setUsingSkillItem(true);
-			_skillItemTask = ThreadPool.schedule(() ->
+			final Creature owner = getOwner();
+			if ((owner != null) && owner.isPlayer())
 			{
-				getOwner().getActingPlayer().setUsingSkillItem(false);
-				getOwner().getStat().recalculateStats(true);
-				getOwner().updateAbnormalVisualEffects();
-				getOwner().getActingPlayer().sendSkillList();
-				_skillItemTask = null;
-			}, 50);
+				final Player player = owner.getActingPlayer();
+				if (player.hasEnteredWorld())
+				{
+					player.setUsingSkillItem(true);
+					_skillItemTask = ThreadPool.schedule(() ->
+					{
+						player.setUsingSkillItem(false);
+						player.getStat().recalculateStats(true);
+						player.updateAbnormalVisualEffects();
+						player.sendSkillList();
+						_skillItemTask = null;
+					}, 50);
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 2312258df6..a96ae2b74e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1592,17 +1592,25 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
+		if (_skillItemTask == null)
 		{
-			getOwner().getActingPlayer().setUsingSkillItem(true);
-			_skillItemTask = ThreadPool.schedule(() ->
+			final Creature owner = getOwner();
+			if ((owner != null) && owner.isPlayer())
 			{
-				getOwner().getActingPlayer().setUsingSkillItem(false);
-				getOwner().getStat().recalculateStats(true);
-				getOwner().updateAbnormalVisualEffects();
-				getOwner().getActingPlayer().sendSkillList();
-				_skillItemTask = null;
-			}, 50);
+				final Player player = owner.getActingPlayer();
+				if (player.hasEnteredWorld())
+				{
+					player.setUsingSkillItem(true);
+					_skillItemTask = ThreadPool.schedule(() ->
+					{
+						player.setUsingSkillItem(false);
+						player.getStat().recalculateStats(true);
+						player.updateAbnormalVisualEffects();
+						player.sendSkillList();
+						_skillItemTask = null;
+					}, 50);
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 965207424a..03fe1e2d58 100644
--- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1603,17 +1603,25 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
+		if (_skillItemTask == null)
 		{
-			getOwner().getActingPlayer().setUsingSkillItem(true);
-			_skillItemTask = ThreadPool.schedule(() ->
+			final Creature owner = getOwner();
+			if ((owner != null) && owner.isPlayer())
 			{
-				getOwner().getActingPlayer().setUsingSkillItem(false);
-				getOwner().getStat().recalculateStats(true);
-				getOwner().updateAbnormalVisualEffects();
-				getOwner().getActingPlayer().sendSkillList();
-				_skillItemTask = null;
-			}, 50);
+				final Player player = owner.getActingPlayer();
+				if (player.hasEnteredWorld())
+				{
+					player.setUsingSkillItem(true);
+					_skillItemTask = ThreadPool.schedule(() ->
+					{
+						player.setUsingSkillItem(false);
+						player.getStat().recalculateStats(true);
+						player.updateAbnormalVisualEffects();
+						player.sendSkillList();
+						_skillItemTask = null;
+					}, 50);
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 965207424a..03fe1e2d58 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1603,17 +1603,25 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
+		if (_skillItemTask == null)
 		{
-			getOwner().getActingPlayer().setUsingSkillItem(true);
-			_skillItemTask = ThreadPool.schedule(() ->
+			final Creature owner = getOwner();
+			if ((owner != null) && owner.isPlayer())
 			{
-				getOwner().getActingPlayer().setUsingSkillItem(false);
-				getOwner().getStat().recalculateStats(true);
-				getOwner().updateAbnormalVisualEffects();
-				getOwner().getActingPlayer().sendSkillList();
-				_skillItemTask = null;
-			}, 50);
+				final Player player = owner.getActingPlayer();
+				if (player.hasEnteredWorld())
+				{
+					player.setUsingSkillItem(true);
+					_skillItemTask = ThreadPool.schedule(() ->
+					{
+						player.setUsingSkillItem(false);
+						player.getStat().recalculateStats(true);
+						player.updateAbnormalVisualEffects();
+						player.sendSkillList();
+						_skillItemTask = null;
+					}, 50);
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index cb5f70a595..24b1770d12 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1434,17 +1434,25 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
+		if (_skillItemTask == null)
 		{
-			getOwner().getActingPlayer().setUsingSkillItem(true);
-			_skillItemTask = ThreadPool.schedule(() ->
+			final Creature owner = getOwner();
+			if ((owner != null) && owner.isPlayer())
 			{
-				getOwner().getActingPlayer().setUsingSkillItem(false);
-				getOwner().getStat().recalculateStats(true);
-				getOwner().updateAbnormalVisualEffects();
-				getOwner().getActingPlayer().sendSkillList();
-				_skillItemTask = null;
-			}, 50);
+				final Player player = owner.getActingPlayer();
+				if (player.hasEnteredWorld())
+				{
+					player.setUsingSkillItem(true);
+					_skillItemTask = ThreadPool.schedule(() ->
+					{
+						player.setUsingSkillItem(false);
+						player.getStat().recalculateStats(true);
+						player.updateAbnormalVisualEffects();
+						player.sendSkillList();
+						_skillItemTask = null;
+					}, 50);
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index cb5f70a595..24b1770d12 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1434,17 +1434,25 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
+		if (_skillItemTask == null)
 		{
-			getOwner().getActingPlayer().setUsingSkillItem(true);
-			_skillItemTask = ThreadPool.schedule(() ->
+			final Creature owner = getOwner();
+			if ((owner != null) && owner.isPlayer())
 			{
-				getOwner().getActingPlayer().setUsingSkillItem(false);
-				getOwner().getStat().recalculateStats(true);
-				getOwner().updateAbnormalVisualEffects();
-				getOwner().getActingPlayer().sendSkillList();
-				_skillItemTask = null;
-			}, 50);
+				final Player player = owner.getActingPlayer();
+				if (player.hasEnteredWorld())
+				{
+					player.setUsingSkillItem(true);
+					_skillItemTask = ThreadPool.schedule(() ->
+					{
+						player.setUsingSkillItem(false);
+						player.getStat().recalculateStats(true);
+						player.updateAbnormalVisualEffects();
+						player.sendSkillList();
+						_skillItemTask = null;
+					}, 50);
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 426820e765..8529b7814d 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1536,17 +1536,25 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
+		if (_skillItemTask == null)
 		{
-			getOwner().getActingPlayer().setUsingSkillItem(true);
-			_skillItemTask = ThreadPool.schedule(() ->
+			final Creature owner = getOwner();
+			if ((owner != null) && owner.isPlayer())
 			{
-				getOwner().getActingPlayer().setUsingSkillItem(false);
-				getOwner().getStat().recalculateStats(true);
-				getOwner().updateAbnormalVisualEffects();
-				getOwner().getActingPlayer().sendSkillList();
-				_skillItemTask = null;
-			}, 50);
+				final Player player = owner.getActingPlayer();
+				if (player.hasEnteredWorld())
+				{
+					player.setUsingSkillItem(true);
+					_skillItemTask = ThreadPool.schedule(() ->
+					{
+						player.setUsingSkillItem(false);
+						player.getStat().recalculateStats(true);
+						player.updateAbnormalVisualEffects();
+						player.sendSkillList();
+						_skillItemTask = null;
+					}, 50);
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 584c900aef..dcaf9135a9 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1618,17 +1618,25 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
+		if (_skillItemTask == null)
 		{
-			getOwner().getActingPlayer().setUsingSkillItem(true);
-			_skillItemTask = ThreadPool.schedule(() ->
+			final Creature owner = getOwner();
+			if ((owner != null) && owner.isPlayer())
 			{
-				getOwner().getActingPlayer().setUsingSkillItem(false);
-				getOwner().getStat().recalculateStats(true);
-				getOwner().updateAbnormalVisualEffects();
-				getOwner().getActingPlayer().sendSkillList();
-				_skillItemTask = null;
-			}, 50);
+				final Player player = owner.getActingPlayer();
+				if (player.hasEnteredWorld())
+				{
+					player.setUsingSkillItem(true);
+					_skillItemTask = ThreadPool.schedule(() ->
+					{
+						player.setUsingSkillItem(false);
+						player.getStat().recalculateStats(true);
+						player.updateAbnormalVisualEffects();
+						player.sendSkillList();
+						_skillItemTask = null;
+					}, 50);
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 584c900aef..dcaf9135a9 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1618,17 +1618,25 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
+		if (_skillItemTask == null)
 		{
-			getOwner().getActingPlayer().setUsingSkillItem(true);
-			_skillItemTask = ThreadPool.schedule(() ->
+			final Creature owner = getOwner();
+			if ((owner != null) && owner.isPlayer())
 			{
-				getOwner().getActingPlayer().setUsingSkillItem(false);
-				getOwner().getStat().recalculateStats(true);
-				getOwner().updateAbnormalVisualEffects();
-				getOwner().getActingPlayer().sendSkillList();
-				_skillItemTask = null;
-			}, 50);
+				final Player player = owner.getActingPlayer();
+				if (player.hasEnteredWorld())
+				{
+					player.setUsingSkillItem(true);
+					_skillItemTask = ThreadPool.schedule(() ->
+					{
+						player.setUsingSkillItem(false);
+						player.getStat().recalculateStats(true);
+						player.updateAbnormalVisualEffects();
+						player.sendSkillList();
+						_skillItemTask = null;
+					}, 50);
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 28f1d07c13..ee7c19c339 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1612,17 +1612,25 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
+		if (_skillItemTask == null)
 		{
-			getOwner().getActingPlayer().setUsingSkillItem(true);
-			_skillItemTask = ThreadPool.schedule(() ->
+			final Creature owner = getOwner();
+			if ((owner != null) && owner.isPlayer())
 			{
-				getOwner().getActingPlayer().setUsingSkillItem(false);
-				getOwner().getStat().recalculateStats(true);
-				getOwner().updateAbnormalVisualEffects();
-				getOwner().getActingPlayer().sendSkillList();
-				_skillItemTask = null;
-			}, 50);
+				final Player player = owner.getActingPlayer();
+				if (player.hasEnteredWorld())
+				{
+					player.setUsingSkillItem(true);
+					_skillItemTask = ThreadPool.schedule(() ->
+					{
+						player.setUsingSkillItem(false);
+						player.getStat().recalculateStats(true);
+						player.updateAbnormalVisualEffects();
+						player.sendSkillList();
+						_skillItemTask = null;
+					}, 50);
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index c3962abe78..be4c4b2df9 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1426,17 +1426,25 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
+		if (_skillItemTask == null)
 		{
-			getOwner().getActingPlayer().setUsingSkillItem(true);
-			_skillItemTask = ThreadPool.schedule(() ->
+			final Creature owner = getOwner();
+			if ((owner != null) && owner.isPlayer())
 			{
-				getOwner().getActingPlayer().setUsingSkillItem(false);
-				getOwner().getStat().recalculateStats(true);
-				getOwner().updateAbnormalVisualEffects();
-				getOwner().getActingPlayer().sendSkillList();
-				_skillItemTask = null;
-			}, 50);
+				final Player player = owner.getActingPlayer();
+				if (player.hasEnteredWorld())
+				{
+					player.setUsingSkillItem(true);
+					_skillItemTask = ThreadPool.schedule(() ->
+					{
+						player.setUsingSkillItem(false);
+						player.getStat().recalculateStats(true);
+						player.updateAbnormalVisualEffects();
+						player.sendSkillList();
+						_skillItemTask = null;
+					}, 50);
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 87e8da66c4..b06708b9cd 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1720,17 +1720,25 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
+		if (_skillItemTask == null)
 		{
-			getOwner().getActingPlayer().setUsingSkillItem(true);
-			_skillItemTask = ThreadPool.schedule(() ->
+			final Creature owner = getOwner();
+			if ((owner != null) && owner.isPlayer())
 			{
-				getOwner().getActingPlayer().setUsingSkillItem(false);
-				getOwner().getStat().recalculateStats(true);
-				getOwner().updateAbnormalVisualEffects();
-				getOwner().getActingPlayer().sendSkillList();
-				_skillItemTask = null;
-			}, 50);
+				final Player player = owner.getActingPlayer();
+				if (player.hasEnteredWorld())
+				{
+					player.setUsingSkillItem(true);
+					_skillItemTask = ThreadPool.schedule(() ->
+					{
+						player.setUsingSkillItem(false);
+						player.getStat().recalculateStats(true);
+						player.updateAbnormalVisualEffects();
+						player.sendSkillList();
+						_skillItemTask = null;
+					}, 50);
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 9ccf975242..215a134870 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1729,17 +1729,25 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
+		if (_skillItemTask == null)
 		{
-			getOwner().getActingPlayer().setUsingSkillItem(true);
-			_skillItemTask = ThreadPool.schedule(() ->
+			final Creature owner = getOwner();
+			if ((owner != null) && owner.isPlayer())
 			{
-				getOwner().getActingPlayer().setUsingSkillItem(false);
-				getOwner().getStat().recalculateStats(true);
-				getOwner().updateAbnormalVisualEffects();
-				getOwner().getActingPlayer().sendSkillList();
-				_skillItemTask = null;
-			}, 50);
+				final Player player = owner.getActingPlayer();
+				if (player.hasEnteredWorld())
+				{
+					player.setUsingSkillItem(true);
+					_skillItemTask = ThreadPool.schedule(() ->
+					{
+						player.setUsingSkillItem(false);
+						player.getStat().recalculateStats(true);
+						player.updateAbnormalVisualEffects();
+						player.sendSkillList();
+						_skillItemTask = null;
+					}, 50);
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 9ccf975242..215a134870 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1729,17 +1729,25 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
+		if (_skillItemTask == null)
 		{
-			getOwner().getActingPlayer().setUsingSkillItem(true);
-			_skillItemTask = ThreadPool.schedule(() ->
+			final Creature owner = getOwner();
+			if ((owner != null) && owner.isPlayer())
 			{
-				getOwner().getActingPlayer().setUsingSkillItem(false);
-				getOwner().getStat().recalculateStats(true);
-				getOwner().updateAbnormalVisualEffects();
-				getOwner().getActingPlayer().sendSkillList();
-				_skillItemTask = null;
-			}, 50);
+				final Player player = owner.getActingPlayer();
+				if (player.hasEnteredWorld())
+				{
+					player.setUsingSkillItem(true);
+					_skillItemTask = ThreadPool.schedule(() ->
+					{
+						player.setUsingSkillItem(false);
+						player.getStat().recalculateStats(true);
+						player.updateAbnormalVisualEffects();
+						player.sendSkillList();
+						_skillItemTask = null;
+					}, 50);
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 9ccf975242..215a134870 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1729,17 +1729,25 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
+		if (_skillItemTask == null)
 		{
-			getOwner().getActingPlayer().setUsingSkillItem(true);
-			_skillItemTask = ThreadPool.schedule(() ->
+			final Creature owner = getOwner();
+			if ((owner != null) && owner.isPlayer())
 			{
-				getOwner().getActingPlayer().setUsingSkillItem(false);
-				getOwner().getStat().recalculateStats(true);
-				getOwner().updateAbnormalVisualEffects();
-				getOwner().getActingPlayer().sendSkillList();
-				_skillItemTask = null;
-			}, 50);
+				final Player player = owner.getActingPlayer();
+				if (player.hasEnteredWorld())
+				{
+					player.setUsingSkillItem(true);
+					_skillItemTask = ThreadPool.schedule(() ->
+					{
+						player.setUsingSkillItem(false);
+						player.getStat().recalculateStats(true);
+						player.updateAbnormalVisualEffects();
+						player.sendSkillList();
+						_skillItemTask = null;
+					}, 50);
+				}
+			}
 		}
 	}