diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 29a3deea8e..f517215691 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1075,7 +1075,8 @@ public class Npc extends Creature
 			setClanId(getCastle().getOwnerId());
 		}
 		
-		if (CREATURE_SEE_IDS.contains(getId()))
+		if (isAttackable() // OnCreatureSee for non attackables is triggered at World.
+			&& CREATURE_SEE_IDS.contains(getId()))
 		{
 			initSeenCreatures();
 		}
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java
index ae62ac9508..78d38118a2 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1075,7 +1075,8 @@ public class Npc extends Creature
 			setClanId(getCastle().getOwnerId());
 		}
 		
-		if (CREATURE_SEE_IDS.contains(getId()))
+		if (isAttackable() // OnCreatureSee for non attackables is triggered at World.
+			&& CREATURE_SEE_IDS.contains(getId()))
 		{
 			initSeenCreatures();
 		}
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java
index ae62ac9508..78d38118a2 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1075,7 +1075,8 @@ public class Npc extends Creature
 			setClanId(getCastle().getOwnerId());
 		}
 		
-		if (CREATURE_SEE_IDS.contains(getId()))
+		if (isAttackable() // OnCreatureSee for non attackables is triggered at World.
+			&& CREATURE_SEE_IDS.contains(getId()))
 		{
 			initSeenCreatures();
 		}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java
index ae62ac9508..78d38118a2 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1075,7 +1075,8 @@ public class Npc extends Creature
 			setClanId(getCastle().getOwnerId());
 		}
 		
-		if (CREATURE_SEE_IDS.contains(getId()))
+		if (isAttackable() // OnCreatureSee for non attackables is triggered at World.
+			&& CREATURE_SEE_IDS.contains(getId()))
 		{
 			initSeenCreatures();
 		}
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java
index ae62ac9508..78d38118a2 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1075,7 +1075,8 @@ public class Npc extends Creature
 			setClanId(getCastle().getOwnerId());
 		}
 		
-		if (CREATURE_SEE_IDS.contains(getId()))
+		if (isAttackable() // OnCreatureSee for non attackables is triggered at World.
+			&& CREATURE_SEE_IDS.contains(getId()))
 		{
 			initSeenCreatures();
 		}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java
index ae62ac9508..78d38118a2 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1075,7 +1075,8 @@ public class Npc extends Creature
 			setClanId(getCastle().getOwnerId());
 		}
 		
-		if (CREATURE_SEE_IDS.contains(getId()))
+		if (isAttackable() // OnCreatureSee for non attackables is triggered at World.
+			&& CREATURE_SEE_IDS.contains(getId()))
 		{
 			initSeenCreatures();
 		}
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java
index ae62ac9508..78d38118a2 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1075,7 +1075,8 @@ public class Npc extends Creature
 			setClanId(getCastle().getOwnerId());
 		}
 		
-		if (CREATURE_SEE_IDS.contains(getId()))
+		if (isAttackable() // OnCreatureSee for non attackables is triggered at World.
+			&& CREATURE_SEE_IDS.contains(getId()))
 		{
 			initSeenCreatures();
 		}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java
index ae62ac9508..78d38118a2 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1075,7 +1075,8 @@ public class Npc extends Creature
 			setClanId(getCastle().getOwnerId());
 		}
 		
-		if (CREATURE_SEE_IDS.contains(getId()))
+		if (isAttackable() // OnCreatureSee for non attackables is triggered at World.
+			&& CREATURE_SEE_IDS.contains(getId()))
 		{
 			initSeenCreatures();
 		}
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Npc.java
index b3f7db3fa1..cffee3cb36 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1076,7 +1076,8 @@ public class Npc extends Creature
 			setClanId(getCastle().getOwnerId());
 		}
 		
-		if (CREATURE_SEE_IDS.contains(getId()))
+		if (isAttackable() // OnCreatureSee for non attackables is triggered at World.
+			&& CREATURE_SEE_IDS.contains(getId()))
 		{
 			initSeenCreatures();
 		}
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Npc.java
index b3f7db3fa1..cffee3cb36 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1076,7 +1076,8 @@ public class Npc extends Creature
 			setClanId(getCastle().getOwnerId());
 		}
 		
-		if (CREATURE_SEE_IDS.contains(getId()))
+		if (isAttackable() // OnCreatureSee for non attackables is triggered at World.
+			&& CREATURE_SEE_IDS.contains(getId()))
 		{
 			initSeenCreatures();
 		}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 922513c085..f7a557d251 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1290,7 +1290,8 @@ public class Npc extends Creature
 			WalkingManager.getInstance().onSpawn(this);
 		}
 		
-		if (CREATURE_SEE_IDS.contains(getId()))
+		if (isAttackable() // OnCreatureSee for non attackables is triggered at World.
+			&& CREATURE_SEE_IDS.contains(getId()))
 		{
 			initSeenCreatures();
 		}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 922513c085..f7a557d251 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1290,7 +1290,8 @@ public class Npc extends Creature
 			WalkingManager.getInstance().onSpawn(this);
 		}
 		
-		if (CREATURE_SEE_IDS.contains(getId()))
+		if (isAttackable() // OnCreatureSee for non attackables is triggered at World.
+			&& CREATURE_SEE_IDS.contains(getId()))
 		{
 			initSeenCreatures();
 		}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 5ed095baa4..98f29221e7 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1075,7 +1075,8 @@ public class Npc extends Creature
 			setClanId(getCastle().getOwnerId());
 		}
 		
-		if (CREATURE_SEE_IDS.contains(getId()))
+		if (isAttackable() // OnCreatureSee for non attackables is triggered at World.
+			&& CREATURE_SEE_IDS.contains(getId()))
 		{
 			initSeenCreatures();
 		}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 5ed095baa4..98f29221e7 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1075,7 +1075,8 @@ public class Npc extends Creature
 			setClanId(getCastle().getOwnerId());
 		}
 		
-		if (CREATURE_SEE_IDS.contains(getId()))
+		if (isAttackable() // OnCreatureSee for non attackables is triggered at World.
+			&& CREATURE_SEE_IDS.contains(getId()))
 		{
 			initSeenCreatures();
 		}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 5ed095baa4..98f29221e7 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1075,7 +1075,8 @@ public class Npc extends Creature
 			setClanId(getCastle().getOwnerId());
 		}
 		
-		if (CREATURE_SEE_IDS.contains(getId()))
+		if (isAttackable() // OnCreatureSee for non attackables is triggered at World.
+			&& CREATURE_SEE_IDS.contains(getId()))
 		{
 			initSeenCreatures();
 		}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 050f15b78d..a61e331b9c 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1087,7 +1087,8 @@ public class Npc extends Creature
 			setClanId(getCastle().getOwnerId());
 		}
 		
-		if (CREATURE_SEE_IDS.contains(getId()))
+		if (isAttackable() // OnCreatureSee for non attackables is triggered at World.
+			&& CREATURE_SEE_IDS.contains(getId()))
 		{
 			initSeenCreatures();
 		}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 050f15b78d..a61e331b9c 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1087,7 +1087,8 @@ public class Npc extends Creature
 			setClanId(getCastle().getOwnerId());
 		}
 		
-		if (CREATURE_SEE_IDS.contains(getId()))
+		if (isAttackable() // OnCreatureSee for non attackables is triggered at World.
+			&& CREATURE_SEE_IDS.contains(getId()))
 		{
 			initSeenCreatures();
 		}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 050f15b78d..a61e331b9c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1087,7 +1087,8 @@ public class Npc extends Creature
 			setClanId(getCastle().getOwnerId());
 		}
 		
-		if (CREATURE_SEE_IDS.contains(getId()))
+		if (isAttackable() // OnCreatureSee for non attackables is triggered at World.
+			&& CREATURE_SEE_IDS.contains(getId()))
 		{
 			initSeenCreatures();
 		}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 044002951d..dbc8d46b0c 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1059,7 +1059,8 @@ public class Npc extends Creature
 			setClanId(getCastle().getOwnerId());
 		}
 		
-		if (CREATURE_SEE_IDS.contains(getId()))
+		if (isAttackable() // OnCreatureSee for non attackables is triggered at World.
+			&& CREATURE_SEE_IDS.contains(getId()))
 		{
 			initSeenCreatures();
 		}
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 6fbde3d9db..6f53720640 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1088,7 +1088,8 @@ public class Npc extends Creature
 			setClanId(getCastle().getOwnerId());
 		}
 		
-		if (CREATURE_SEE_IDS.contains(getId()))
+		if (isAttackable() // OnCreatureSee for non attackables is triggered at World.
+			&& CREATURE_SEE_IDS.contains(getId()))
 		{
 			initSeenCreatures();
 		}
diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 6fbde3d9db..6f53720640 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1088,7 +1088,8 @@ public class Npc extends Creature
 			setClanId(getCastle().getOwnerId());
 		}
 		
-		if (CREATURE_SEE_IDS.contains(getId()))
+		if (isAttackable() // OnCreatureSee for non attackables is triggered at World.
+			&& CREATURE_SEE_IDS.contains(getId()))
 		{
 			initSeenCreatures();
 		}
diff --git a/L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 6fbde3d9db..6f53720640 100644
--- a/L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -1088,7 +1088,8 @@ public class Npc extends Creature
 			setClanId(getCastle().getOwnerId());
 		}
 		
-		if (CREATURE_SEE_IDS.contains(getId()))
+		if (isAttackable() // OnCreatureSee for non attackables is triggered at World.
+			&& CREATURE_SEE_IDS.contains(getId()))
 		{
 			initSeenCreatures();
 		}