diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java
index 22a1cf5830..7420babf23 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -430,6 +430,7 @@ public class Player extends Playable
 	private String _htmlPrefix = "";
 	
 	private volatile boolean _isOnline = false;
+	private boolean _enteredWorld = false;
 	private long _onlineTime;
 	private long _onlineBeginTime;
 	private long _lastAccess;
@@ -6182,8 +6183,10 @@ public class Player extends Playable
 		broadcastPacket(new Ride(this));
 		setMountObjectID(0);
 		storePetFood(petId);
+		
 		// Notify self and others about speed change
 		broadcastUserInfo();
+		
 		return true;
 	}
 	
@@ -7386,6 +7389,16 @@ public class Player extends Playable
 		return 0;
 	}
 	
+	public void setEnteredWorld()
+	{
+		_enteredWorld = true;
+	}
+	
+	public boolean hasEnteredWorld()
+	{
+		return _enteredWorld;
+	}
+	
 	/**
 	 * Verifies if the player is in offline mode.<br>
 	 * The offline mode may happen for different reasons:<br>
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 2b45073c3e..448e98e0e6 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
@@ -1425,7 +1425,7 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && (getOwner().getActingPlayer().getUptime() > 5000))
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
 			getOwner().getActingPlayer().setUsingSkillItem(true);
 			_skillItemTask = ThreadPool.schedule(() ->
diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index d120ebde8d..ded2dc2d4f 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -707,6 +707,9 @@ public class EnterWorld implements IClientIncomingPacket
 				player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.NO_CHAT);
 			}
 		}, 5500);
+		
+		// EnterWorld has finished.
+		player.setEnteredWorld();
 	}
 	
 	/**
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java
index 1a36ee4915..88002290a3 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -432,6 +432,7 @@ public class Player extends Playable
 	private String _htmlPrefix = "";
 	
 	private volatile boolean _isOnline = false;
+	private boolean _enteredWorld = false;
 	private long _onlineTime;
 	private long _onlineBeginTime;
 	private long _lastAccess;
@@ -6184,8 +6185,10 @@ public class Player extends Playable
 		broadcastPacket(new Ride(this));
 		setMountObjectID(0);
 		storePetFood(petId);
+		
 		// Notify self and others about speed change
 		broadcastUserInfo();
+		
 		return true;
 	}
 	
@@ -7389,6 +7392,16 @@ public class Player extends Playable
 		return 0;
 	}
 	
+	public void setEnteredWorld()
+	{
+		_enteredWorld = true;
+	}
+	
+	public boolean hasEnteredWorld()
+	{
+		return _enteredWorld;
+	}
+	
 	/**
 	 * Verifies if the player is in offline mode.<br>
 	 * The offline mode may happen for different reasons:<br>
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 fd6d67d8b3..da8b3fa990 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
@@ -1431,7 +1431,7 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && (getOwner().getActingPlayer().getUptime() > 5000))
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
 			getOwner().getActingPlayer().setUsingSkillItem(true);
 			_skillItemTask = ThreadPool.schedule(() ->
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 761c1bfaa7..fb9d4771b4 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -745,6 +745,9 @@ public class EnterWorld implements IClientIncomingPacket
 				player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.NO_CHAT);
 			}
 		}, 5500);
+		
+		// EnterWorld has finished.
+		player.setEnteredWorld();
 	}
 	
 	/**
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java
index aa241ab61d..036a5162dd 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -434,6 +434,7 @@ public class Player extends Playable
 	private String _htmlPrefix = "";
 	
 	private volatile boolean _isOnline = false;
+	private boolean _enteredWorld = false;
 	private long _onlineTime;
 	private long _onlineBeginTime;
 	private long _lastAccess;
@@ -6186,8 +6187,10 @@ public class Player extends Playable
 		broadcastPacket(new Ride(this));
 		setMountObjectID(0);
 		storePetFood(petId);
+		
 		// Notify self and others about speed change
 		broadcastUserInfo();
+		
 		return true;
 	}
 	
@@ -7391,6 +7394,16 @@ public class Player extends Playable
 		return 0;
 	}
 	
+	public void setEnteredWorld()
+	{
+		_enteredWorld = true;
+	}
+	
+	public boolean hasEnteredWorld()
+	{
+		return _enteredWorld;
+	}
+	
 	/**
 	 * Verifies if the player is in offline mode.<br>
 	 * The offline mode may happen for different reasons:<br>
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 fd6d67d8b3..da8b3fa990 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
@@ -1431,7 +1431,7 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && (getOwner().getActingPlayer().getUptime() > 5000))
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
 			getOwner().getActingPlayer().setUsingSkillItem(true);
 			_skillItemTask = ThreadPool.schedule(() ->
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 761c1bfaa7..fb9d4771b4 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -745,6 +745,9 @@ public class EnterWorld implements IClientIncomingPacket
 				player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.NO_CHAT);
 			}
 		}, 5500);
+		
+		// EnterWorld has finished.
+		player.setEnteredWorld();
 	}
 	
 	/**
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java
index 05ead15f79..9a73b3aa75 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -438,6 +438,7 @@ public class Player extends Playable
 	private String _htmlPrefix = "";
 	
 	private volatile boolean _isOnline = false;
+	private boolean _enteredWorld = false;
 	private long _onlineTime;
 	private long _onlineBeginTime;
 	private long _lastAccess;
@@ -6181,8 +6182,10 @@ public class Player extends Playable
 		broadcastPacket(new Ride(this));
 		setMountObjectID(0);
 		storePetFood(petId);
+		
 		// Notify self and others about speed change
 		broadcastUserInfo();
+		
 		return true;
 	}
 	
@@ -7386,6 +7389,16 @@ public class Player extends Playable
 		return 0;
 	}
 	
+	public void setEnteredWorld()
+	{
+		_enteredWorld = true;
+	}
+	
+	public boolean hasEnteredWorld()
+	{
+		return _enteredWorld;
+	}
+	
 	/**
 	 * Verifies if the player is in offline mode.<br>
 	 * The offline mode may happen for different reasons:<br>
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 a8fac05671..215eaf43c9 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
@@ -1431,7 +1431,7 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && (getOwner().getActingPlayer().getUptime() > 5000))
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
 			getOwner().getActingPlayer().setUsingSkillItem(true);
 			_skillItemTask = ThreadPool.schedule(() ->
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index d5a0472fec..bb737916b7 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -745,6 +745,9 @@ public class EnterWorld implements IClientIncomingPacket
 				player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.NO_CHAT);
 			}
 		}, 5500);
+		
+		// EnterWorld has finished.
+		player.setEnteredWorld();
 	}
 	
 	/**
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java
index 7dade8025e..fca112f750 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -436,6 +436,7 @@ public class Player extends Playable
 	private String _htmlPrefix = "";
 	
 	private volatile boolean _isOnline = false;
+	private boolean _enteredWorld = false;
 	private long _onlineTime;
 	private long _onlineBeginTime;
 	private long _lastAccess;
@@ -6198,8 +6199,10 @@ public class Player extends Playable
 		broadcastPacket(new Ride(this));
 		setMountObjectID(0);
 		storePetFood(petId);
+		
 		// Notify self and others about speed change
 		broadcastUserInfo();
+		
 		return true;
 	}
 	
@@ -7402,6 +7405,16 @@ public class Player extends Playable
 		return 0;
 	}
 	
+	public void setEnteredWorld()
+	{
+		_enteredWorld = true;
+	}
+	
+	public boolean hasEnteredWorld()
+	{
+		return _enteredWorld;
+	}
+	
 	/**
 	 * Verifies if the player is in offline mode.<br>
 	 * The offline mode may happen for different reasons:<br>
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 260164e122..56b975ad6e 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
@@ -1441,7 +1441,6 @@ public abstract class Inventory extends ItemContainer
 				}
 			}
 			
-			
 			// Add new item in slot of paperdoll
 			if (item != null)
 			{
@@ -1534,7 +1533,7 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && (getOwner().getActingPlayer().getUptime() > 5000))
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
 			getOwner().getActingPlayer().setUsingSkillItem(true);
 			_skillItemTask = ThreadPool.schedule(() ->
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index ca6e57705d..8afadb5194 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -751,6 +751,9 @@ public class EnterWorld implements IClientIncomingPacket
 				player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.NO_CHAT);
 			}
 		}, 5500);
+		
+		// EnterWorld has finished.
+		player.setEnteredWorld();
 	}
 	
 	/**
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java
index d147a706a0..57be4cb92f 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -436,6 +436,7 @@ public class Player extends Playable
 	private String _htmlPrefix = "";
 	
 	private volatile boolean _isOnline = false;
+	private boolean _enteredWorld = false;
 	private long _onlineTime;
 	private long _onlineBeginTime;
 	private long _lastAccess;
@@ -6198,8 +6199,10 @@ public class Player extends Playable
 		broadcastPacket(new Ride(this));
 		setMountObjectID(0);
 		storePetFood(petId);
+		
 		// Notify self and others about speed change
 		broadcastUserInfo();
+		
 		return true;
 	}
 	
@@ -7402,6 +7405,16 @@ public class Player extends Playable
 		return 0;
 	}
 	
+	public void setEnteredWorld()
+	{
+		_enteredWorld = true;
+	}
+	
+	public boolean hasEnteredWorld()
+	{
+		return _enteredWorld;
+	}
+	
 	/**
 	 * Verifies if the player is in offline mode.<br>
 	 * The offline mode may happen for different reasons:<br>
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 8d6ed0cf22..e054f654a9 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
@@ -1523,7 +1523,6 @@ public abstract class Inventory extends ItemContainer
 				}
 			}
 			
-			
 			// Add new item in slot of paperdoll
 			if (item != null)
 			{
@@ -1616,7 +1615,7 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && (getOwner().getActingPlayer().getUptime() > 5000))
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
 			getOwner().getActingPlayer().setUsingSkillItem(true);
 			_skillItemTask = ThreadPool.schedule(() ->
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index ae5cad2e6e..d5f5ac5ce8 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -751,6 +751,9 @@ public class EnterWorld implements IClientIncomingPacket
 				player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.NO_CHAT);
 			}
 		}, 5500);
+		
+		// EnterWorld has finished.
+		player.setEnteredWorld();
 	}
 	
 	/**
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java
index dca4376900..14e90307df 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -436,6 +436,7 @@ public class Player extends Playable
 	private String _htmlPrefix = "";
 	
 	private volatile boolean _isOnline = false;
+	private boolean _enteredWorld = false;
 	private long _onlineTime;
 	private long _onlineBeginTime;
 	private long _lastAccess;
@@ -6199,8 +6200,10 @@ public class Player extends Playable
 		broadcastPacket(new Ride(this));
 		setMountObjectID(0);
 		storePetFood(petId);
+		
 		// Notify self and others about speed change
 		broadcastUserInfo();
+		
 		return true;
 	}
 	
@@ -7403,6 +7406,16 @@ public class Player extends Playable
 		return 0;
 	}
 	
+	public void setEnteredWorld()
+	{
+		_enteredWorld = true;
+	}
+	
+	public boolean hasEnteredWorld()
+	{
+		return _enteredWorld;
+	}
+	
 	/**
 	 * Verifies if the player is in offline mode.<br>
 	 * The offline mode may happen for different reasons:<br>
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 8d6ed0cf22..e054f654a9 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
@@ -1523,7 +1523,6 @@ public abstract class Inventory extends ItemContainer
 				}
 			}
 			
-			
 			// Add new item in slot of paperdoll
 			if (item != null)
 			{
@@ -1616,7 +1615,7 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && (getOwner().getActingPlayer().getUptime() > 5000))
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
 			getOwner().getActingPlayer().setUsingSkillItem(true);
 			_skillItemTask = ThreadPool.schedule(() ->
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index ae5cad2e6e..d5f5ac5ce8 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -751,6 +751,9 @@ public class EnterWorld implements IClientIncomingPacket
 				player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.NO_CHAT);
 			}
 		}, 5500);
+		
+		// EnterWorld has finished.
+		player.setEnteredWorld();
 	}
 	
 	/**
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
index d11ab93fa2..ac7e26785b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -448,6 +448,7 @@ public class Player extends Playable
 	private String _htmlPrefix = "";
 	
 	private volatile boolean _isOnline = false;
+	private boolean _enteredWorld = false;
 	private long _onlineTime;
 	private long _onlineBeginTime;
 	private long _lastAccess;
@@ -6164,8 +6165,10 @@ public class Player extends Playable
 		broadcastPacket(new Ride(this));
 		setMountObjectID(0);
 		storePetFood(petId);
+		
 		// Notify self and others about speed change
 		broadcastUserInfo();
+		
 		return true;
 	}
 	
@@ -7418,6 +7421,16 @@ public class Player extends Playable
 		return 0;
 	}
 	
+	public void setEnteredWorld()
+	{
+		_enteredWorld = true;
+	}
+	
+	public boolean hasEnteredWorld()
+	{
+		return _enteredWorld;
+	}
+	
 	/**
 	 * Verifies if the player is in offline mode.<br>
 	 * The offline mode may happen for different reasons:<br>
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 ac35e0d15b..bf89028833 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
@@ -1517,7 +1517,6 @@ public abstract class Inventory extends ItemContainer
 				}
 			}
 			
-			
 			// Add new item in slot of paperdoll
 			if (item != null)
 			{
@@ -1610,7 +1609,7 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && (getOwner().getActingPlayer().getUptime() > 5000))
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
 			getOwner().getActingPlayer().setUsingSkillItem(true);
 			_skillItemTask = ThreadPool.schedule(() ->
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index de24b1a6e2..224a4fe0fa 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -761,6 +761,9 @@ public class EnterWorld implements IClientIncomingPacket
 				player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.NO_CHAT);
 			}
 		}, 5500);
+		
+		// EnterWorld has finished.
+		player.setEnteredWorld();
 	}
 	
 	/**
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java
index 728206e3ce..73733cb901 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -445,6 +445,7 @@ public class Player extends Playable
 	private String _htmlPrefix = "";
 	
 	private volatile boolean _isOnline = false;
+	private boolean _enteredWorld = false;
 	private long _onlineTime;
 	private long _onlineBeginTime;
 	private long _lastAccess;
@@ -6259,8 +6260,10 @@ public class Player extends Playable
 		broadcastPacket(new Ride(this));
 		setMountObjectID(0);
 		storePetFood(petId);
+		
 		// Notify self and others about speed change
 		broadcastUserInfo();
+		
 		return true;
 	}
 	
@@ -7520,6 +7523,16 @@ public class Player extends Playable
 		return 0;
 	}
 	
+	public void setEnteredWorld()
+	{
+		_enteredWorld = true;
+	}
+	
+	public boolean hasEnteredWorld()
+	{
+		return _enteredWorld;
+	}
+	
 	/**
 	 * Verifies if the player is in offline mode.<br>
 	 * The offline mode may happen for different reasons:<br>
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 65d9cc5c07..c504467dbd 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
@@ -1499,7 +1499,6 @@ public abstract class Inventory extends ItemContainer
 				}
 			}
 			
-			
 			// Add new item in slot of paperdoll
 			if (item != null)
 			{
@@ -1592,7 +1591,7 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && (getOwner().getActingPlayer().getUptime() > 5000))
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
 			getOwner().getActingPlayer().setUsingSkillItem(true);
 			_skillItemTask = ThreadPool.schedule(() ->
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index c19648fe78..6053c40d63 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -782,6 +782,9 @@ public class EnterWorld implements IClientIncomingPacket
 				player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.NO_CHAT);
 			}
 		}, 5500);
+		
+		// EnterWorld has finished.
+		player.setEnteredWorld();
 	}
 	
 	/**
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java
index 34578b97a3..5df08f72dd 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -458,6 +458,7 @@ public class Player extends Playable
 	private String _htmlPrefix = "";
 	
 	private volatile boolean _isOnline = false;
+	private boolean _enteredWorld = false;
 	private long _onlineTime;
 	private long _onlineBeginTime;
 	private long _lastAccess;
@@ -6276,8 +6277,10 @@ public class Player extends Playable
 		broadcastPacket(new Ride(this));
 		setMountObjectID(0);
 		storePetFood(petId);
+		
 		// Notify self and others about speed change
 		broadcastUserInfo();
+		
 		return true;
 	}
 	
@@ -7546,6 +7549,16 @@ public class Player extends Playable
 		return 0;
 	}
 	
+	public void setEnteredWorld()
+	{
+		_enteredWorld = true;
+	}
+	
+	public boolean hasEnteredWorld()
+	{
+		return _enteredWorld;
+	}
+	
 	/**
 	 * Verifies if the player is in offline mode.<br>
 	 * The offline mode may happen for different reasons:<br>
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 65d9cc5c07..c504467dbd 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
@@ -1499,7 +1499,6 @@ public abstract class Inventory extends ItemContainer
 				}
 			}
 			
-			
 			// Add new item in slot of paperdoll
 			if (item != null)
 			{
@@ -1592,7 +1591,7 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && (getOwner().getActingPlayer().getUptime() > 5000))
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
 			getOwner().getActingPlayer().setUsingSkillItem(true);
 			_skillItemTask = ThreadPool.schedule(() ->
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 5b9fb41508..63d20b519b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -792,6 +792,9 @@ public class EnterWorld implements IClientIncomingPacket
 				player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.NO_CHAT);
 			}
 		}, 5500);
+		
+		// EnterWorld has finished.
+		player.setEnteredWorld();
 	}
 	
 	/**
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
index f7338a5cf2..0fc4441350 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -459,6 +459,7 @@ public class Player extends Playable
 	private String _htmlPrefix = "";
 	
 	private volatile boolean _isOnline = false;
+	private boolean _enteredWorld = false;
 	private long _onlineTime;
 	private long _onlineBeginTime;
 	private long _lastAccess;
@@ -6309,8 +6310,10 @@ public class Player extends Playable
 		broadcastPacket(new Ride(this));
 		setMountObjectID(0);
 		storePetFood(petId);
+		
 		// Notify self and others about speed change
 		broadcastUserInfo();
+		
 		return true;
 	}
 	
@@ -7583,6 +7586,16 @@ public class Player extends Playable
 		return 0;
 	}
 	
+	public void setEnteredWorld()
+	{
+		_enteredWorld = true;
+	}
+	
+	public boolean hasEnteredWorld()
+	{
+		return _enteredWorld;
+	}
+	
 	/**
 	 * Verifies if the player is in offline mode.<br>
 	 * The offline mode may happen for different reasons:<br>
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index b251f9e450..e7c0f42957 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1510,7 +1510,6 @@ public abstract class Inventory extends ItemContainer
 				}
 			}
 			
-			
 			// Add new item in slot of paperdoll
 			if (item != null)
 			{
@@ -1603,7 +1602,7 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && (getOwner().getActingPlayer().getUptime() > 5000))
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
 			getOwner().getActingPlayer().setUsingSkillItem(true);
 			_skillItemTask = ThreadPool.schedule(() ->
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 520c1a0dfa..b3c21fe9c4 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -796,6 +796,9 @@ public class EnterWorld implements IClientIncomingPacket
 				player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.NO_CHAT);
 			}
 		}, 5500);
+		
+		// EnterWorld has finished.
+		player.setEnteredWorld();
 	}
 	
 	/**
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java
index 2544586d8c..ca4487611c 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -280,6 +280,7 @@ public class Player extends Playable
 	private String _accountName;
 	private long _deleteTimer;
 	private boolean _isOnline = false;
+	private boolean _enteredWorld = false;
 	private long _onlineTime;
 	private long _onlineBeginTime;
 	private long _lastAccess;
@@ -8172,6 +8173,16 @@ public class Player extends Playable
 		return 0;
 	}
 	
+	public void setEnteredWorld()
+	{
+		_enteredWorld = true;
+	}
+	
+	public boolean hasEnteredWorld()
+	{
+		return _enteredWorld;
+	}
+	
 	/**
 	 * Verifies if the player is in offline mode.<br>
 	 * The offline mode may happen for different reasons:<br>
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index f5209f7c71..afd1da5336 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -587,6 +587,9 @@ public class EnterWorld implements IClientIncomingPacket
 		{
 			player.sendMessage("SVR time is " + fmt.format(new Date(Chronos.currentTimeMillis())));
 		}
+		
+		// EnterWorld has finished.
+		player.setEnteredWorld();
 	}
 	
 	private void colorSystem(Player player)
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
index 1e4c6e9b79..2b88a32acc 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -288,6 +288,7 @@ public class Player extends Playable
 	private String _accountName;
 	private long _deleteTimer;
 	private boolean _isOnline = false;
+	private boolean _enteredWorld = false;
 	private long _onlineTime;
 	private long _onlineBeginTime;
 	private long _lastAccess;
@@ -8325,6 +8326,16 @@ public class Player extends Playable
 		return 0;
 	}
 	
+	public void setEnteredWorld()
+	{
+		_enteredWorld = true;
+	}
+	
+	public boolean hasEnteredWorld()
+	{
+		return _enteredWorld;
+	}
+	
 	/**
 	 * Verifies if the player is in offline mode.<br>
 	 * The offline mode may happen for different reasons:<br>
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 51cf0baddb..752583ca39 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -624,6 +624,9 @@ public class EnterWorld implements IClientIncomingPacket
 		{
 			player.sendMessage("SVR time is " + fmt.format(new Date(Chronos.currentTimeMillis())));
 		}
+		
+		// EnterWorld has finished.
+		player.setEnteredWorld();
 	}
 	
 	private void colorSystem(Player player)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java
index 6ee6e04bf5..a7c2f7853b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -415,6 +415,7 @@ public class Player extends Playable
 	private String _htmlPrefix = "";
 	
 	private volatile boolean _isOnline = false;
+	private boolean _enteredWorld = false;
 	private long _onlineTime;
 	private long _onlineBeginTime;
 	private long _lastAccess;
@@ -6558,8 +6559,10 @@ public class Player extends Playable
 		broadcastPacket(new Ride(this));
 		setMountObjectID(0);
 		storePetFood(petId);
+		
 		// Notify self and others about speed change
 		broadcastUserInfo();
+		
 		return true;
 	}
 	
@@ -7685,6 +7688,16 @@ public class Player extends Playable
 		return 0;
 	}
 	
+	public void setEnteredWorld()
+	{
+		_enteredWorld = true;
+	}
+	
+	public boolean hasEnteredWorld()
+	{
+		return _enteredWorld;
+	}
+	
 	/**
 	 * Verifies if the player is in offline mode.<br>
 	 * The offline mode may happen for different reasons:<br>
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index f32e881b28..4d4c30e56c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -705,6 +705,9 @@ public class EnterWorld implements IClientIncomingPacket
 				}
 			}, 5000);
 		}
+		
+		// EnterWorld has finished.
+		player.setEnteredWorld();
 	}
 	
 	private void engage(Player player)
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java
index c730428cff..fb28a000dc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -434,6 +434,7 @@ public class Player extends Playable
 	private String _htmlPrefix = "";
 	
 	private volatile boolean _isOnline = false;
+	private boolean _enteredWorld = false;
 	private long _onlineTime;
 	private long _onlineBeginTime;
 	private long _lastAccess;
@@ -6455,8 +6456,10 @@ public class Player extends Playable
 		broadcastPacket(new Ride(this));
 		setMountObjectID(0);
 		storePetFood(petId);
+		
 		// Notify self and others about speed change
 		broadcastUserInfo();
+		
 		return true;
 	}
 	
@@ -7568,6 +7571,16 @@ public class Player extends Playable
 		return 0;
 	}
 	
+	public void setEnteredWorld()
+	{
+		_enteredWorld = true;
+	}
+	
+	public boolean hasEnteredWorld()
+	{
+		return _enteredWorld;
+	}
+	
 	/**
 	 * Verifies if the player is in offline mode.<br>
 	 * The offline mode may happen for different reasons:<br>
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 3cdd849fe5..21ad0f596b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -704,6 +704,9 @@ public class EnterWorld implements IClientIncomingPacket
 				}
 			}, 5000);
 		}
+		
+		// EnterWorld has finished.
+		player.setEnteredWorld();
 	}
 	
 	private void engage(Player player)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java
index 00c9cad7fc..372641a162 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -434,6 +434,7 @@ public class Player extends Playable
 	private String _htmlPrefix = "";
 	
 	private volatile boolean _isOnline = false;
+	private boolean _enteredWorld = false;
 	private long _onlineTime;
 	private long _onlineBeginTime;
 	private long _lastAccess;
@@ -6157,8 +6158,10 @@ public class Player extends Playable
 		broadcastPacket(new Ride(this));
 		setMountObjectID(0);
 		storePetFood(petId);
+		
 		// Notify self and others about speed change
 		broadcastUserInfo();
+		
 		return true;
 	}
 	
@@ -7344,6 +7347,16 @@ public class Player extends Playable
 		return 0;
 	}
 	
+	public void setEnteredWorld()
+	{
+		_enteredWorld = true;
+	}
+	
+	public boolean hasEnteredWorld()
+	{
+		return _enteredWorld;
+	}
+	
 	/**
 	 * Verifies if the player is in offline mode.<br>
 	 * The offline mode may happen for different reasons:<br>
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 6032548f61..c2bfa2d041 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
@@ -1433,7 +1433,7 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && (getOwner().getActingPlayer().getUptime() > 5000))
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
 			getOwner().getActingPlayer().setUsingSkillItem(true);
 			_skillItemTask = ThreadPool.schedule(() ->
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 44cbc9b871..b3874c66c3 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -724,6 +724,9 @@ public class EnterWorld implements IClientIncomingPacket
 				player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.NO_CHAT);
 			}
 		}, 5500);
+		
+		// EnterWorld has finished.
+		player.setEnteredWorld();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java
index 1bfe237fa2..bef6214575 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -434,6 +434,7 @@ public class Player extends Playable
 	private String _htmlPrefix = "";
 	
 	private volatile boolean _isOnline = false;
+	private boolean _enteredWorld = false;
 	private long _onlineTime;
 	private long _onlineBeginTime;
 	private long _lastAccess;
@@ -6157,8 +6158,10 @@ public class Player extends Playable
 		broadcastPacket(new Ride(this));
 		setMountObjectID(0);
 		storePetFood(petId);
+		
 		// Notify self and others about speed change
 		broadcastUserInfo();
+		
 		return true;
 	}
 	
@@ -7344,6 +7347,16 @@ public class Player extends Playable
 		return 0;
 	}
 	
+	public void setEnteredWorld()
+	{
+		_enteredWorld = true;
+	}
+	
+	public boolean hasEnteredWorld()
+	{
+		return _enteredWorld;
+	}
+	
 	/**
 	 * Verifies if the player is in offline mode.<br>
 	 * The offline mode may happen for different reasons:<br>
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 6032548f61..c2bfa2d041 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
@@ -1433,7 +1433,7 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && (getOwner().getActingPlayer().getUptime() > 5000))
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
 			getOwner().getActingPlayer().setUsingSkillItem(true);
 			_skillItemTask = ThreadPool.schedule(() ->
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 4c88389652..23ec201cf1 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -724,6 +724,9 @@ public class EnterWorld implements IClientIncomingPacket
 				player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.NO_CHAT);
 			}
 		}, 5500);
+		
+		// EnterWorld has finished.
+		player.setEnteredWorld();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java
index e83186dae0..2a5b42f06b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -432,6 +432,7 @@ public class Player extends Playable
 	private String _htmlPrefix = "";
 	
 	private volatile boolean _isOnline = false;
+	private boolean _enteredWorld = false;
 	private long _onlineTime;
 	private long _onlineBeginTime;
 	private long _lastAccess;
@@ -6143,8 +6144,10 @@ public class Player extends Playable
 		broadcastPacket(new Ride(this));
 		setMountObjectID(0);
 		storePetFood(petId);
+		
 		// Notify self and others about speed change
 		broadcastUserInfo();
+		
 		return true;
 	}
 	
@@ -7330,6 +7333,16 @@ public class Player extends Playable
 		return 0;
 	}
 	
+	public void setEnteredWorld()
+	{
+		_enteredWorld = true;
+	}
+	
+	public boolean hasEnteredWorld()
+	{
+		return _enteredWorld;
+	}
+	
 	/**
 	 * Verifies if the player is in offline mode.<br>
 	 * The offline mode may happen for different reasons:<br>
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 ab69b447d8..11b647cf11 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
@@ -1443,7 +1443,6 @@ public abstract class Inventory extends ItemContainer
 				}
 			}
 			
-			
 			// Add new item in slot of paperdoll
 			if (item != null)
 			{
@@ -1536,7 +1535,7 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && (getOwner().getActingPlayer().getUptime() > 5000))
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
 			getOwner().getActingPlayer().setUsingSkillItem(true);
 			_skillItemTask = ThreadPool.schedule(() ->
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 39ea656a1f..0d966b9efc 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -734,6 +734,9 @@ public class EnterWorld implements IClientIncomingPacket
 				player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.NO_CHAT);
 			}
 		}, 5500);
+		
+		// EnterWorld has finished.
+		player.setEnteredWorld();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java
index e4a6ec46bf..17de94f738 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -440,6 +440,7 @@ public class Player extends Playable
 	private String _htmlPrefix = "";
 	
 	private volatile boolean _isOnline = false;
+	private boolean _enteredWorld = false;
 	private long _onlineTime;
 	private long _onlineBeginTime;
 	private long _lastAccess;
@@ -6157,8 +6158,10 @@ public class Player extends Playable
 		broadcastPacket(new Ride(this));
 		setMountObjectID(0);
 		storePetFood(petId);
+		
 		// Notify self and others about speed change
 		broadcastUserInfo();
+		
 		return true;
 	}
 	
@@ -7357,6 +7360,16 @@ public class Player extends Playable
 		return 0;
 	}
 	
+	public void setEnteredWorld()
+	{
+		_enteredWorld = true;
+	}
+	
+	public boolean hasEnteredWorld()
+	{
+		return _enteredWorld;
+	}
+	
 	/**
 	 * Verifies if the player is in offline mode.<br>
 	 * The offline mode may happen for different reasons:<br>
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 2bdfa04e2d..8788701cad 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
@@ -1525,7 +1525,6 @@ public abstract class Inventory extends ItemContainer
 				}
 			}
 			
-			
 			// Add new item in slot of paperdoll
 			if (item != null)
 			{
@@ -1618,7 +1617,7 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && (getOwner().getActingPlayer().getUptime() > 5000))
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
 			getOwner().getActingPlayer().setUsingSkillItem(true);
 			_skillItemTask = ThreadPool.schedule(() ->
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 39ea656a1f..0d966b9efc 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -734,6 +734,9 @@ public class EnterWorld implements IClientIncomingPacket
 				player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.NO_CHAT);
 			}
 		}, 5500);
+		
+		// EnterWorld has finished.
+		player.setEnteredWorld();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java
index 3000c4e52d..474d24757d 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -440,6 +440,7 @@ public class Player extends Playable
 	private String _htmlPrefix = "";
 	
 	private volatile boolean _isOnline = false;
+	private boolean _enteredWorld = false;
 	private long _onlineTime;
 	private long _onlineBeginTime;
 	private long _lastAccess;
@@ -6157,8 +6158,10 @@ public class Player extends Playable
 		broadcastPacket(new Ride(this));
 		setMountObjectID(0);
 		storePetFood(petId);
+		
 		// Notify self and others about speed change
 		broadcastUserInfo();
+		
 		return true;
 	}
 	
@@ -7357,6 +7360,16 @@ public class Player extends Playable
 		return 0;
 	}
 	
+	public void setEnteredWorld()
+	{
+		_enteredWorld = true;
+	}
+	
+	public boolean hasEnteredWorld()
+	{
+		return _enteredWorld;
+	}
+	
 	/**
 	 * Verifies if the player is in offline mode.<br>
 	 * The offline mode may happen for different reasons:<br>
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 2bdfa04e2d..8788701cad 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
@@ -1525,7 +1525,6 @@ public abstract class Inventory extends ItemContainer
 				}
 			}
 			
-			
 			// Add new item in slot of paperdoll
 			if (item != null)
 			{
@@ -1618,7 +1617,7 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && (getOwner().getActingPlayer().getUptime() > 5000))
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
 			getOwner().getActingPlayer().setUsingSkillItem(true);
 			_skillItemTask = ThreadPool.schedule(() ->
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 39ea656a1f..0d966b9efc 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -734,6 +734,9 @@ public class EnterWorld implements IClientIncomingPacket
 				player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.NO_CHAT);
 			}
 		}, 5500);
+		
+		// EnterWorld has finished.
+		player.setEnteredWorld();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java
index fab4b1189f..925e97230c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -454,6 +454,7 @@ public class Player extends Playable
 	private String _htmlPrefix = "";
 	
 	private volatile boolean _isOnline = false;
+	private boolean _enteredWorld = false;
 	private long _onlineTime;
 	private long _onlineBeginTime;
 	private long _lastAccess;
@@ -6112,8 +6113,10 @@ public class Player extends Playable
 		broadcastPacket(new Ride(this));
 		setMountObjectID(0);
 		storePetFood(petId);
+		
 		// Notify self and others about speed change
 		broadcastUserInfo();
+		
 		return true;
 	}
 	
@@ -7310,6 +7313,16 @@ public class Player extends Playable
 		return 0;
 	}
 	
+	public void setEnteredWorld()
+	{
+		_enteredWorld = true;
+	}
+	
+	public boolean hasEnteredWorld()
+	{
+		return _enteredWorld;
+	}
+	
 	/**
 	 * Verifies if the player is in offline mode.<br>
 	 * The offline mode may happen for different reasons:<br>
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 e8d95ce601..9f42b97ce8 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
@@ -1519,7 +1519,6 @@ public abstract class Inventory extends ItemContainer
 				}
 			}
 			
-			
 			// Add new item in slot of paperdoll
 			if (item != null)
 			{
@@ -1612,7 +1611,7 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && (getOwner().getActingPlayer().getUptime() > 5000))
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
 			getOwner().getActingPlayer().setUsingSkillItem(true);
 			_skillItemTask = ThreadPool.schedule(() ->
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index bf81b0f120..72a2d44d73 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -742,6 +742,9 @@ public class EnterWorld implements IClientIncomingPacket
 				player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.NO_CHAT);
 			}
 		}, 5500);
+		
+		// EnterWorld has finished.
+		player.setEnteredWorld();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
index 4375f92e35..187a51f09d 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -429,6 +429,7 @@ public class Player extends Playable
 	private String _htmlPrefix = "";
 	
 	private volatile boolean _isOnline = false;
+	private boolean _enteredWorld = false;
 	private long _onlineTime;
 	private long _onlineBeginTime;
 	private long _lastAccess;
@@ -6138,8 +6139,10 @@ public class Player extends Playable
 		broadcastPacket(new Ride(this));
 		setMountObjectID(0);
 		storePetFood(petId);
+		
 		// Notify self and others about speed change
 		broadcastUserInfo();
+		
 		return true;
 	}
 	
@@ -7322,6 +7325,16 @@ public class Player extends Playable
 		return 0;
 	}
 	
+	public void setEnteredWorld()
+	{
+		_enteredWorld = true;
+	}
+	
+	public boolean hasEnteredWorld()
+	{
+		return _enteredWorld;
+	}
+	
 	/**
 	 * Verifies if the player is in offline mode.<br>
 	 * The offline mode may happen for different reasons:<br>
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 7d2858f967..90f74e7715 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
@@ -1425,7 +1425,7 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && (getOwner().getActingPlayer().getUptime() > 5000))
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
 			getOwner().getActingPlayer().setUsingSkillItem(true);
 			_skillItemTask = ThreadPool.schedule(() ->
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 1ac07d9acc..58c91d6f72 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -720,6 +720,9 @@ public class EnterWorld implements IClientIncomingPacket
 				player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.NO_CHAT);
 			}
 		}, 5500);
+		
+		// EnterWorld has finished.
+		player.setEnteredWorld();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java
index 61295a9cfd..39feed866e 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -464,6 +464,7 @@ public class Player extends Playable
 	private String _htmlPrefix = "";
 	
 	private volatile boolean _isOnline = false;
+	private boolean _enteredWorld = false;
 	private long _onlineTime;
 	private long _onlineBeginTime;
 	private long _lastAccess;
@@ -6247,8 +6248,10 @@ public class Player extends Playable
 		broadcastPacket(new Ride(this));
 		setMountObjectID(0);
 		storePetFood(petId);
+		
 		// Notify self and others about speed change
 		broadcastUserInfo();
+		
 		return true;
 	}
 	
@@ -7462,6 +7465,16 @@ public class Player extends Playable
 		return 0;
 	}
 	
+	public void setEnteredWorld()
+	{
+		_enteredWorld = true;
+	}
+	
+	public boolean hasEnteredWorld()
+	{
+		return _enteredWorld;
+	}
+	
 	/**
 	 * Verifies if the player is in offline mode.<br>
 	 * The offline mode may happen for different reasons:<br>
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 0a436d151e..c79243f4e3 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
@@ -1627,7 +1627,6 @@ public abstract class Inventory extends ItemContainer
 				}
 			}
 			
-			
 			// Add new item in slot of paperdoll
 			if (item != null)
 			{
@@ -1720,7 +1719,7 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && (getOwner().getActingPlayer().getUptime() > 5000))
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
 			getOwner().getActingPlayer().setUsingSkillItem(true);
 			_skillItemTask = ThreadPool.schedule(() ->
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 6ab7771955..a00fafc666 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -779,6 +779,9 @@ public class EnterWorld implements IClientIncomingPacket
 				player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.NO_CHAT);
 			}
 		}, 5500);
+		
+		// EnterWorld has finished.
+		player.setEnteredWorld();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
index 1a299d2607..9900762d99 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -488,6 +488,7 @@ public class Player extends Playable
 	private String _htmlPrefix = "";
 	
 	private volatile boolean _isOnline = false;
+	private boolean _enteredWorld = false;
 	private long _onlineTime;
 	private long _onlineBeginTime;
 	private long _lastAccess;
@@ -6292,8 +6293,10 @@ public class Player extends Playable
 		broadcastPacket(new Ride(this));
 		setMountObjectID(0);
 		storePetFood(petId);
+		
 		// Notify self and others about speed change
 		broadcastUserInfo();
+		
 		return true;
 	}
 	
@@ -7528,6 +7531,16 @@ public class Player extends Playable
 		return 0;
 	}
 	
+	public void setEnteredWorld()
+	{
+		_enteredWorld = true;
+	}
+	
+	public boolean hasEnteredWorld()
+	{
+		return _enteredWorld;
+	}
+	
 	/**
 	 * Verifies if the player is in offline mode.<br>
 	 * The offline mode may happen for different reasons:<br>
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 6f40531177..0cf7e6ff8b 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
@@ -1636,7 +1636,6 @@ public abstract class Inventory extends ItemContainer
 				}
 			}
 			
-			
 			// Add new item in slot of paperdoll
 			if (item != null)
 			{
@@ -1729,7 +1728,7 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && (getOwner().getActingPlayer().getUptime() > 5000))
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
 			getOwner().getActingPlayer().setUsingSkillItem(true);
 			_skillItemTask = ThreadPool.schedule(() ->
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 6cc4e27880..0a049553ef 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -793,6 +793,9 @@ public class EnterWorld implements IClientIncomingPacket
 				player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.NO_CHAT);
 			}
 		}, 5500);
+		
+		// EnterWorld has finished.
+		player.setEnteredWorld();
 	}
 	
 	/**
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
index aa8c205c53..28fa8b0f80 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -488,6 +488,7 @@ public class Player extends Playable
 	private String _htmlPrefix = "";
 	
 	private volatile boolean _isOnline = false;
+	private boolean _enteredWorld = false;
 	private long _onlineTime;
 	private long _onlineBeginTime;
 	private long _lastAccess;
@@ -6292,8 +6293,10 @@ public class Player extends Playable
 		broadcastPacket(new Ride(this));
 		setMountObjectID(0);
 		storePetFood(petId);
+		
 		// Notify self and others about speed change
 		broadcastUserInfo();
+		
 		return true;
 	}
 	
@@ -7528,6 +7531,16 @@ public class Player extends Playable
 		return 0;
 	}
 	
+	public void setEnteredWorld()
+	{
+		_enteredWorld = true;
+	}
+	
+	public boolean hasEnteredWorld()
+	{
+		return _enteredWorld;
+	}
+	
 	/**
 	 * Verifies if the player is in offline mode.<br>
 	 * The offline mode may happen for different reasons:<br>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
index 6f40531177..0cf7e6ff8b 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
@@ -1636,7 +1636,6 @@ public abstract class Inventory extends ItemContainer
 				}
 			}
 			
-			
 			// Add new item in slot of paperdoll
 			if (item != null)
 			{
@@ -1729,7 +1728,7 @@ public abstract class Inventory extends ItemContainer
 	 */
 	private void checkEquipTask()
 	{
-		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && (getOwner().getActingPlayer().getUptime() > 5000))
+		if ((_skillItemTask == null) && (getOwner() != null) && getOwner().isPlayer() && getOwner().getActingPlayer().hasEnteredWorld())
 		{
 			getOwner().getActingPlayer().setUsingSkillItem(true);
 			_skillItemTask = ThreadPool.schedule(() ->
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 0b2d39571c..ded40cce87 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -793,6 +793,9 @@ public class EnterWorld implements IClientIncomingPacket
 				player.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.NO_CHAT);
 			}
 		}, 5500);
+		
+		// EnterWorld has finished.
+		player.setEnteredWorld();
 	}
 	
 	/**