diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index fd9b11b279..f297368e93 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -68,16 +68,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index fd9b11b279..f297368e93 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -68,16 +68,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index fd9b11b279..f297368e93 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -68,16 +68,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index fd9b11b279..f297368e93 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -68,16 +68,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index fd9b11b279..f297368e93 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -68,16 +68,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index fd9b11b279..f297368e93 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -68,16 +68,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index fd9b11b279..f297368e93 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -68,16 +68,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index fd9b11b279..f297368e93 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -68,16 +68,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index fd9b11b279..f297368e93 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -68,16 +68,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index fd9b11b279..f297368e93 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -68,16 +68,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index fd9b11b279..f297368e93 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -68,16 +68,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index fd9b11b279..f297368e93 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -68,16 +68,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index 2ba48429dc..39db220982 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -67,16 +67,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index 2ba48429dc..39db220982 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -67,16 +67,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index 2ba48429dc..39db220982 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -67,16 +67,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index fd9b11b279..f297368e93 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -68,16 +68,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index fd9b11b279..f297368e93 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -68,16 +68,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index fd9b11b279..f297368e93 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -68,16 +68,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index fd9b11b279..f297368e93 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -68,16 +68,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index fd9b11b279..f297368e93 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -68,16 +68,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index fd9b11b279..f297368e93 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -68,16 +68,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index fd9b11b279..f297368e93 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -68,16 +68,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index fd9b11b279..f297368e93 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -68,16 +68,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index fd9b11b279..f297368e93 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -68,16 +68,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index fd9b11b279..f297368e93 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -68,16 +68,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index fd9b11b279..f297368e93 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -68,16 +68,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index fd9b11b279..f297368e93 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -68,16 +68,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index fd9b11b279..f297368e93 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -68,16 +68,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/util/BuilderUtil.java
index fd9b11b279..f297368e93 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/util/BuilderUtil.java
@@ -68,16 +68,19 @@ public class BuilderUtil
 	 */
 	public static boolean setHiding(Player player, boolean hide)
 	{
-		if (player.isInvisible() && hide)
+		if (player.hasEnteredWorld())
 		{
-			// already hiding
-			return false;
-		}
-		
-		if (!player.isInvisible() && !hide)
-		{
-			// already visible
-			return false;
+			if (player.isInvisible() && hide)
+			{
+				// already hiding
+				return false;
+			}
+			
+			if (!player.isInvisible() && !hide)
+			{
+				// already visible
+				return false;
+			}
 		}
 		
 		player.setSilenceMode(hide);