Notify OnCreatureSee for creatures that do not trigger EVT_THINK.

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/World.java

@@ -37,6 +37,8 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
+import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee;
 import org.l2jmobius.gameserver.network.Disconnection;
 import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
 
@@ -355,6 +357,13 @@ public class World
 					}
 				}
 			}
+			
+			// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+			if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+			{
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+			}
 		});
 	}
 	
@@ -568,6 +577,13 @@ public class World
 						}
 					}
 				}
+				
+				// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+				if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+				{
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+				}
 			}
 		}
 	}

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/World.java

@@ -37,6 +37,8 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
+import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee;
 import org.l2jmobius.gameserver.network.Disconnection;
 import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
 
@@ -355,6 +357,13 @@ public class World
 					}
 				}
 			}
+			
+			// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+			if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+			{
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+			}
 		});
 	}
 	
@@ -568,6 +577,13 @@ public class World
 						}
 					}
 				}
+				
+				// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+				if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+				{
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+				}
 			}
 		}
 	}

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/World.java

@@ -37,6 +37,8 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
+import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee;
 import org.l2jmobius.gameserver.network.Disconnection;
 import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
 
@@ -355,6 +357,13 @@ public class World
 					}
 				}
 			}
+			
+			// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+			if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+			{
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+			}
 		});
 	}
 	
@@ -568,6 +577,13 @@ public class World
 						}
 					}
 				}
+				
+				// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+				if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+				{
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+				}
 			}
 		}
 	}

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/World.java

@@ -37,6 +37,8 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
+import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee;
 import org.l2jmobius.gameserver.network.Disconnection;
 import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
 
@@ -355,6 +357,13 @@ public class World
 					}
 				}
 			}
+			
+			// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+			if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+			{
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+			}
 		});
 	}
 	
@@ -568,6 +577,13 @@ public class World
 						}
 					}
 				}
+				
+				// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+				if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+				{
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+				}
 			}
 		}
 	}

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/World.java

@@ -37,6 +37,8 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
+import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee;
 import org.l2jmobius.gameserver.network.Disconnection;
 import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
 
@@ -355,6 +357,13 @@ public class World
 					}
 				}
 			}
+			
+			// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+			if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+			{
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+			}
 		});
 	}
 	
@@ -568,6 +577,13 @@ public class World
 						}
 					}
 				}
+				
+				// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+				if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+				{
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+				}
 			}
 		}
 	}

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/World.java

@@ -37,6 +37,8 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
+import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee;
 import org.l2jmobius.gameserver.network.Disconnection;
 import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
 
@@ -355,6 +357,13 @@ public class World
 					}
 				}
 			}
+			
+			// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+			if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+			{
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+			}
 		});
 	}
 	
@@ -568,6 +577,13 @@ public class World
 						}
 					}
 				}
+				
+				// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+				if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+				{
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+				}
 			}
 		}
 	}

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/World.java

@@ -37,6 +37,8 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
+import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee;
 import org.l2jmobius.gameserver.network.Disconnection;
 import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
 
@@ -355,6 +357,13 @@ public class World
 					}
 				}
 			}
+			
+			// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+			if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+			{
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+			}
 		});
 	}
 	
@@ -568,6 +577,13 @@ public class World
 						}
 					}
 				}
+				
+				// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+				if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+				{
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+				}
 			}
 		}
 	}

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/World.java

@@ -37,6 +37,8 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
+import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee;
 import org.l2jmobius.gameserver.network.Disconnection;
 import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
 
@@ -355,6 +357,13 @@ public class World
 					}
 				}
 			}
+			
+			// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+			if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+			{
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+			}
 		});
 	}
 	
@@ -568,6 +577,13 @@ public class World
 						}
 					}
 				}
+				
+				// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+				if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+				{
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+				}
 			}
 		}
 	}

L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/World.java

@@ -39,6 +39,8 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
+import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee;
 import org.l2jmobius.gameserver.network.Disconnection;
 import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
 
@@ -360,6 +362,13 @@ public class World
 					}
 				}
 			}
+			
+			// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+			if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+			{
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+			}
 		});
 	}
 	
@@ -573,6 +582,13 @@ public class World
 						}
 					}
 				}
+				
+				// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+				if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+				{
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+				}
 			}
 		}
 	}

L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/World.java

@@ -39,6 +39,8 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
+import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee;
 import org.l2jmobius.gameserver.network.Disconnection;
 import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
 
@@ -360,6 +362,13 @@ public class World
 					}
 				}
 			}
+			
+			// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+			if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+			{
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+			}
 		});
 	}
 	
@@ -573,6 +582,13 @@ public class World
 						}
 					}
 				}
+				
+				// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+				if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+				{
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+				}
 			}
 		}
 	}

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/World.java

@@ -36,6 +36,8 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
+import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee;
 import org.l2jmobius.gameserver.network.Disconnection;
 import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
 
@@ -351,6 +353,13 @@ public class World
 					}
 				}
 			}
+			
+			// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+			if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+			{
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+			}
 		});
 	}
 	
@@ -564,6 +573,13 @@ public class World
 						}
 					}
 				}
+				
+				// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+				if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+				{
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+				}
 			}
 		}
 	}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/World.java

@@ -36,6 +36,8 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
+import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee;
 import org.l2jmobius.gameserver.network.Disconnection;
 import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
 
@@ -351,6 +353,13 @@ public class World
 					}
 				}
 			}
+			
+			// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+			if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+			{
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+			}
 		});
 	}
 	
@@ -564,6 +573,13 @@ public class World
 						}
 					}
 				}
+				
+				// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+				if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+				{
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+				}
 			}
 		}
 	}

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/World.java

@@ -37,6 +37,8 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
+import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee;
 import org.l2jmobius.gameserver.network.Disconnection;
 import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
 
@@ -355,6 +357,13 @@ public class World
 					}
 				}
 			}
+			
+			// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+			if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+			{
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+			}
 		});
 	}
 	
@@ -568,6 +577,13 @@ public class World
 						}
 					}
 				}
+				
+				// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+				if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+				{
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+				}
 			}
 		}
 	}

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/World.java

@@ -37,6 +37,8 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
+import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee;
 import org.l2jmobius.gameserver.network.Disconnection;
 import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
 
@@ -355,6 +357,13 @@ public class World
 					}
 				}
 			}
+			
+			// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+			if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+			{
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+			}
 		});
 	}
 	
@@ -568,6 +577,13 @@ public class World
 						}
 					}
 				}
+				
+				// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+				if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+				{
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+				}
 			}
 		}
 	}

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/World.java

@@ -37,6 +37,8 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
+import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee;
 import org.l2jmobius.gameserver.network.Disconnection;
 import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
 
@@ -355,6 +357,13 @@ public class World
 					}
 				}
 			}
+			
+			// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+			if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+			{
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+			}
 		});
 	}
 	
@@ -568,6 +577,13 @@ public class World
 						}
 					}
 				}
+				
+				// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+				if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+				{
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+				}
 			}
 		}
 	}

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/World.java

@@ -37,6 +37,8 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
+import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee;
 import org.l2jmobius.gameserver.network.Disconnection;
 import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
 
@@ -355,6 +357,13 @@ public class World
 					}
 				}
 			}
+			
+			// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+			if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+			{
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+			}
 		});
 	}
 	
@@ -568,6 +577,13 @@ public class World
 						}
 					}
 				}
+				
+				// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+				if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+				{
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+				}
 			}
 		}
 	}

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/World.java

@@ -37,6 +37,8 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
+import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee;
 import org.l2jmobius.gameserver.network.Disconnection;
 import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
 
@@ -355,6 +357,13 @@ public class World
 					}
 				}
 			}
+			
+			// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+			if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+			{
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+			}
 		});
 	}
 	
@@ -568,6 +577,13 @@ public class World
 						}
 					}
 				}
+				
+				// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+				if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+				{
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+				}
 			}
 		}
 	}

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/World.java

@@ -37,6 +37,8 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
+import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee;
 import org.l2jmobius.gameserver.network.Disconnection;
 import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
 
@@ -355,6 +357,13 @@ public class World
 					}
 				}
 			}
+			
+			// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+			if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+			{
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+			}
 		});
 	}
 	
@@ -568,6 +577,13 @@ public class World
 						}
 					}
 				}
+				
+				// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+				if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+				{
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+				}
 			}
 		}
 	}

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/World.java

@@ -37,6 +37,8 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
+import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee;
 import org.l2jmobius.gameserver.network.Disconnection;
 import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
 
@@ -355,6 +357,13 @@ public class World
 					}
 				}
 			}
+			
+			// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+			if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+			{
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+			}
 		});
 	}
 	
@@ -568,6 +577,13 @@ public class World
 						}
 					}
 				}
+				
+				// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+				if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+				{
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+				}
 			}
 		}
 	}

L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/World.java

@@ -37,6 +37,8 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
+import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee;
 import org.l2jmobius.gameserver.network.Disconnection;
 import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
 
@@ -355,6 +357,13 @@ public class World
 					}
 				}
 			}
+			
+			// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+			if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+			{
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+			}
 		});
 	}
 	
@@ -568,6 +577,13 @@ public class World
 						}
 					}
 				}
+				
+				// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+				if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+				{
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+				}
 			}
 		}
 	}

L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/World.java

@@ -37,6 +37,8 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
+import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee;
 import org.l2jmobius.gameserver.network.Disconnection;
 import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
 
@@ -355,6 +357,13 @@ public class World
 					}
 				}
 			}
+			
+			// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+			if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+			{
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+			}
 		});
 	}
 	
@@ -568,6 +577,13 @@ public class World
 						}
 					}
 				}
+				
+				// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+				if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+				{
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+				}
 			}
 		}
 	}

L2J_Mobius_Essence_5.5_FrostLord/java/org/l2jmobius/gameserver/model/World.java

@@ -37,6 +37,8 @@ import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.events.EventDispatcher;
+import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee;
 import org.l2jmobius.gameserver.network.Disconnection;
 import org.l2jmobius.gameserver.network.serverpackets.DeleteObject;
 
@@ -355,6 +357,13 @@ public class World
 					}
 				}
 			}
+			
+			// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+			if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+			{
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+				EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+			}
 		});
 	}
 	
@@ -568,6 +577,13 @@ public class World
 						}
 					}
 				}
+				
+				// Notify OnCreatureSee for creatures that do not trigger EVT_THINK.
+				if (!wo.isAttackable() && wo.isCreature() && object.isCreature())
+				{
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) wo, (Creature) object), (Creature) wo);
+					EventDispatcher.getInstance().notifyEventAsync(new OnCreatureSee((Creature) object, (Creature) wo), (Creature) object);
+				}
 			}
 		}
 	}